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)
commit5dfe1017e495140b38031e9b41fbd29309063d4d
tree069aaad4a59329f3c7c34716d2f16b8859df3477
parentd386942a08f55869aa639ecab830ef72ebdebd32
parentb7b88e6874da63d6afc4495935e8032590bb52a7
Merge changes I936ddd89,I1f20b8df

* changes:
  BUG-48: add integration test for pcep-spi
  BUG-99: switch packaging to jar