You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2016/04/14 00:56:35 UTC
[6/6] incubator-tamaya git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-tamaya
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tamaya
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/92b5db1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/92b5db1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/92b5db1b
Branch: refs/heads/master
Commit: 92b5db1bd4cc2ed2b0f244712f254a0436179376
Parents: 87b0958 b13368d
Author: anatole <an...@apache.org>
Authored: Thu Apr 14 00:55:30 2016 +0200
Committer: anatole <an...@apache.org>
Committed: Thu Apr 14 00:55:30 2016 +0200
----------------------------------------------------------------------
distribution/src/main/resources/attributes.adoc | 17 +++++++
docs/src/main/resources/attributes.adoc | 17 +++++++
pom.xml | 14 +++---
src/main/resources/attributes.adoc | 17 +++++++
src/site/markdown/index.md | 48 ------------------
src/site/markdown/index.md.vm | 53 ++++++++++++++++++++
src/site/site.xml | 4 +-
7 files changed, 113 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/92b5db1b/pom.xml
----------------------------------------------------------------------