Merge changes Ic258c7ad,Ica65d017
authorAndrew Grimberg <agrimberg@linuxfoundation.org>
Mon, 5 Jan 2015 16:50:58 +0000 (16:50 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 5 Jan 2015 16:50:58 +0000 (16:50 +0000)
commitf56df5d877d406deea4725f0ae593774e86c2592
tree17a2396db1a0a4deeebc8aa76c6ddea4ed094c6f
parent0264633ebac50e6bce1e5972cd10bdd6344a6567
parent297bc27f944f7ffe4501f0f91ace251ff57483cc
Merge changes Ic258c7ad,Ica65d017

* changes:
  Ignore changes to jenkins.ini
  Remove --quiet from git diff