Merge changes I936ddd89,I1f20b8df
authorDana Kutenicsova <dkutenic@cisco.com>
Mon, 7 Oct 2013 12:04:07 +0000 (12:04 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 7 Oct 2013 12:04:07 +0000 (12:04 +0000)
* changes:
  BUG-48: add integration test for pcep-spi
  BUG-99: switch packaging to jar


Trivial merge