directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject [directory-ldap-api] 02/02: Merge branch 'master' of https://gitbox.apache.org/repos/asf/directory-ldap-api
Date Sat, 09 Jun 2018 22:50:48 GMT
This is an automated email from the ASF dual-hosted git repository.

elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-ldap-api.git

commit 3c3df9a04128b45abe701bf73ebfcdc30802e8d9
Merge: 46bb4ba 85a3c1d
Author: Emmanuel L├ęcharny <elecharny@symas.com>
AuthorDate: Sun Jun 10 00:50:08 2018 +0200

    Merge branch 'master' of https://gitbox.apache.org/repos/asf/directory-ldap-api

 .../resources/org/apache/directory/api/i18n/errors.properties     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --cc i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties
index 219127c,e3c1336..26c3aac
--- a/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties
+++ b/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties
@@@ -329,25 -329,19 +329,20 @@@ ERR_05155_FLAG_TYPE_INVALID=The types o
  ERR_05156_INVALID_ATTRIBUTE_TYPE=The Attribute type {0} is invalid : {1}
  ERR_05157_INVALID_DN=The Dn {0} is invalid : {1}
  
--
  ERR_04059=Expected either a byte[] or ByteBuffer argument but got a {0}
 -ERR_04060=Ldap decoder failure: {0}
  ERR_04061=Ldap decoder failure!
 -ERR_04062=Ldap decoder failure, PDU does not contain enough data
 -ERR_04063=The input stream does not contain a full PDU
  ERR_04064=Ldap decoder failure: The input stream does not contain a full PDU
  ERR_04065=Ldap encoder failed to encode object: {0}, error: {1}
  
 -
 -
 -
  # api-ldap-codec-core api       5200-5299
 +ERR_05200_NOT_INITIALIZED_YET=Not initialized yet!
 +ERR_05201_INSTANCE_ALREADY_SET=The LdapCodecService is already set to an instance of {0}
 +ERR_05202_FAILED_TO_INSTANCIATE=Failed to instantiate a viable instance, instantiating new
instance of {0}
 +ERR_05203_CODEC_ARGS_CANNOT_BE_NULL=Codec argument cannot be null
 +ERR_05204_LDAP_DECODER_FAILURE=Ldap decoder failure: {0}
 +ERR_05205_PDU_DOES_NOT_CONTAIN_ENOUGH_DATA=Ldap decoder failure, PDU does not contain enough
data
 +ERR_05206_INPUT_STREAM_TOO_SHORT_PDU=The input stream does not contain a full PDU
 +
- ERR_04060=
- ERR_04062=Ldap decoder failure, PDU does not contain enough data
- ERR_04063=The input stream does not contain a full PDU
- 
  # api-ldap-codec-core controls  5300-5399
  ERR_05300_CANT_DECODE_CHANGE_TYPE=failed to decode the changeType for EntryChangeControl
  ERR_05301_INVALID_PREVIOUS_DN=The previousDN field should not contain anything if the changeType
is not MODDN
@@@ -362,10 -356,6 +357,13 @@@ ERR_05309_RETURN_ECS_DECODING_ERROR=fai
  ERR_05310_INVALID_VISIBILITY_FLAG=The visibility flag {0} is invalid: {1}. It should be
0 or 255
  
  # api-ldap-codec-core osgi      5400-5499
++<<<<<<< HEAD
 +ERR_05400_CONTROL_ARGUMENT_WAS_NULL=Control argument was null.
 +ERR_05401_FIGURE_OUT_HOW_TO_TRANSFORM=Figure out how to transform
 +ERR_05402_UNABLE_TO_ENCODE_RESPONSE_VALUE=Unable to decode encoded response value: {0}
 +
++=======
++>>>>>>> 85a3c1dba3cb60248666bde279b64019e217a9af
  # api-ldap-codec-core search    5500-5599
  ERR_05500_NULL_MATCHING_RULE_AND_TYPE=Cannot have a null matching rule and a null type
  ERR_05501_MORE_THAN_ONE_FILTER_FOR_NOT_FILTER=Cannot have more than one Filter within a
Not Filter

-- 
To stop receiving notification emails like this one, please contact
elecharny@apache.org.

Mime
View raw message