Merge remote-tracking branch 'origin/master'

Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/0469103b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/0469103b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/0469103b

Branch: refs/heads/master
Commit: 0469103bf04a28a5057bcf70261d8289e97869a0
Parents: d0fea28 4e62b05
Author: anatole <atsti...@gmail.com>
Authored: Thu Jul 2 00:59:36 2015 +0200
Committer: anatole <atsti...@gmail.com>
Committed: Thu Jul 2 00:59:36 2015 +0200

----------------------------------------------------------------------
 distribution/pom.xml                            |   4 +-
 .../src/main/assembly/distribution-bin.xml      | 131 +++++++++++++++++++
 distribution/src/main/assembly/distribution.xml | 131 -------------------
 .../tamaya/events/spi/ConfigEventSpi.java       |   3 +-
 4 files changed, 134 insertions(+), 135 deletions(-)
----------------------------------------------------------------------


Reply via email to