[2/2] incubator-tamaya git commit: Merge remote-tracking branch 'origin/master'
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(-) --
[2/2] incubator-tamaya git commit: Merge remote-tracking branch 'origin/master'
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/4b001504 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/4b001504 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/4b001504 Branch: refs/heads/master Commit: 4b0015048f519b6111586c415a93cceb95157d27 Parents: 3a0bf17 5bd97c9 Author: anatole anat...@apache.org Authored: Mon Jan 5 10:13:51 2015 +0100 Committer: anatole anat...@apache.org Committed: Mon Jan 5 10:13:51 2015 +0100 -- .../org/apache/tamaya/core/internal/PropertyConverterManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] incubator-tamaya git commit: Merge remote-tracking branch 'origin/master'
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/7f39 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/7f39 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/7f39 Branch: refs/heads/master Commit: 7f39e7d1f748d73d614e665d684d9a383a9c Parents: 11708a6 dbf8af8 Author: anatole anat...@apache.org Authored: Sun Jan 4 21:59:49 2015 +0100 Committer: anatole anat...@apache.org Committed: Sun Jan 4 21:59:49 2015 +0100 -- pom.xml | 12 1 file changed, 8 insertions(+), 4 deletions(-) --