You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/09/19 23:05:02 UTC

svn commit: r1172818 - in /camel/branches/camel-2.8.x: ./ components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEncryptionMethod.java

Author: dkulp
Date: Mon Sep 19 21:05:01 2011
New Revision: 1172818

URL: http://svn.apache.org/viewvc?rev=1172818&view=rev
Log:
Merged revisions 1159128 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1159128 | davsclaus | 2011-08-18 06:07:37 -0400 (Thu, 18 Aug 2011) | 1 line
  
  CAMEL-4349: Added encryptionMode option to camel-nagios.
........

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEncryptionMethod.java

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.8.x/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEncryptionMethod.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEncryptionMethod.java?rev=1172818&r1=1172817&r2=1172818&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEncryptionMethod.java (original)
+++ camel/branches/camel-2.8.x/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEncryptionMethod.java Mon Sep 19 21:05:01 2011
@@ -21,6 +21,6 @@ package org.apache.camel.component.nagio
  */
 public enum NagiosEncryptionMethod {
 
-    No, Xor, TripeDes;
+    No, Xor, TripleDes;
 
 }