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/01/19 22:33:47 UTC
[2/2] 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/af2255af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/af2255af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/af2255af
Branch: refs/heads/master
Commit: af2255afd85fed94cd57d15e23083891ac0d19f4
Parents: ddd2955 2e7933a
Author: anatole <an...@apache.org>
Authored: Tue Jan 19 08:45:51 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Tue Jan 19 08:45:51 2016 +0100
----------------------------------------------------------------------
code/api/pom.xml | 2 +-
code/core/pom.xml | 2 +-
.../etcd/internal/EtcdConfigChangeRequest.java | 24 +++++++-------
.../mutableconfig/ConfigChangeRequest.java | 2 +-
src/site/asciidoc/extensions/index.adoc | 33 ++++++++++---------
src/site/asciidoc/extensions/mod_camel.adoc | 32 +++++++++---------
src/site/asciidoc/extensions/mod_cdi.adoc | 32 +++++++++---------
.../extensions/mod_classloader_support.adoc | 32 +++++++++---------
.../asciidoc/extensions/mod_environment.adoc | 32 +++++++++---------
src/site/asciidoc/extensions/mod_etcd.adoc | 32 +++++++++---------
src/site/asciidoc/extensions/mod_events.adoc | 34 +++++++++++---------
src/site/asciidoc/extensions/mod_formats.adoc | 34 +++++++++++---------
src/site/asciidoc/extensions/mod_functions.adoc | 34 +++++++++++---------
src/site/asciidoc/extensions/mod_injection.adoc | 34 +++++++++++---------
src/site/asciidoc/extensions/mod_jodatime.adoc | 34 +++++++++++---------
src/site/asciidoc/extensions/mod_json.adoc | 17 ++++++++++
.../asciidoc/extensions/mod_management.adoc | 34 +++++++++++---------
.../extensions/mod_metamodel-staged.adoc | 32 +++++++++---------
src/site/asciidoc/extensions/mod_model.adoc | 34 +++++++++++---------
.../asciidoc/extensions/mod_mutable_config.adoc | 34 +++++++++++---------
src/site/asciidoc/extensions/mod_optional.adoc | 34 +++++++++++---------
src/site/asciidoc/extensions/mod_osgi.adoc | 34 +++++++++++---------
src/site/asciidoc/extensions/mod_remote.adoc | 34 +++++++++++---------
.../asciidoc/extensions/mod_spi-support.adoc | 32 +++++++++---------
src/site/asciidoc/extensions/mod_spring.adoc | 31 +++++++++---------
25 files changed, 382 insertions(+), 327 deletions(-)
----------------------------------------------------------------------