external-software/github_OpenIdentityPlatform_OpenDJ.git

external-software / github_OpenIdentityPlatform_OpenDJ

mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Merge remote-tracking branch 'origin/master' into vharseko-master

vharseko

19.21.2018 33ebabfeaf6ac35ccfa1cf3106872f93cb7985a8

refs
author	vharseko <vharseko@openam.org.ru>
	Friday, October 19, 2018 18:21 +0200
committer	vharseko <vharseko@openam.org.ru>
	Friday, October 19, 2018 18:21 +0200
commit	33ebabfeaf6ac35ccfa1cf3106872f93cb7985a8
tree	6aba0c61058358a7ebeb3524d6b748a4ece3ddaa tree \| zip \| gz
parent	cb5c2375c9e95163977b0a6ad30566c9033b5ec9 view \| diff 2c2b7358ae1027abc234415ad8ca38803c52253c view \| diff

Merge remote-tracking branch 'origin/master' into vharseko-master

Conflicts:
	opendj-bom/pom.xml
	pom.xml

30 files modified

	README.md	1 ●●●●● diff \| view \| raw \| blame \| history
	opendj-cli/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-config/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-core/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-doc-generated-ref/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-doc-maven-plugin/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-dsml-servlet/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-embedded-server-examples/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-grizzly/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-ldap-sdk-examples/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-ldap-toolkit/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-legacy/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-maven-plugin/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-openidm-account-change-notification-handler/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-packages/opendj-deb/opendj-deb-standard/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-packages/opendj-deb/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-packages/opendj-docker/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-packages/opendj-msi/opendj-msi-standard/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-packages/opendj-msi/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-packages/opendj-rpm/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-packages/opendj-svr4/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-packages/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-rest2ldap-servlet/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-rest2ldap/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/Rest2LdapJsonConfiguratorTest.java	7 ●●●●● diff \| view \| raw \| blame \| history
	opendj-server-example-plugin/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-server-legacy/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	opendj-server/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	pom.xml	8 ●●●●● diff \| view \| raw \| blame \| history