Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,837 Commits 22 Branches 130 Tags 97 MiB
Commit Graph

1459 Commits

Author SHA1 Message Date
Adrian Cole d57197c103 cleaned up code references detected as unnecessary by UEC plugin 2013-01-12 12:31:00 -08:00
Everett Toews 6bc848c232 More attributes and domain objects for Rackspace Cloud Load Balancers. 2013-01-11 16:18:14 -06:00
adriancole 9d75aa353d refactored ec2 tests so that they can be used in aws-ec2 2013-01-10 13:38:58 -08:00
adriancole 992e9ebbcf change cacheloader that can return nulls to return optional so to avoid cacheload exceptions 2013-01-10 13:20:27 -08:00
Adrian Cole 47c215c63c removed custom guava code for scoped binding and type params 2013-01-08 22:48:10 -08:00
Andrew Gaul 6da0c84101 Ignore ETags with non-hex suffixes 
Amazon S3 blobs created via multi-part uploads have these suffixes.
Reference:

https://forums.aws.amazon.com/thread.jspa?messageID=203510
 2013-01-08 17:08:06 -08:00
Adrian Cole 2480481835 dependent changes on tests and internal classes 2013-01-08 00:32:45 -08:00
Adrian Cole 3089111621 refactored internal code and tests to use FunctionalReflection 2013-01-07 00:36:31 -08:00
Adrian Cole 74c633f90a moved all providers and test cases from j.l.r.Method -> Invokable 2013-01-05 18:51:38 -08:00
Adrian Cole afc070ac07 First wave of RestAnnotationParser refactoring introduces Invokable, removes SeedAnnotationCache and associated race conditions 2013-01-04 13:51:46 -08:00
Adrian Cole 36123a6068 deterministic creation of requests based on arg order 2013-01-04 12:44:26 -08:00
Adrian Cole a17e8e25d7 removed need to support multiple @EndpointParam annotations 2013-01-04 11:31:06 -08:00
Adrian Cole 8121444f04 removed deprecated cloudwatch method 2013-01-03 16:13:27 -08:00
Hugo Trippaers 28e8f2663d Test the password tool with a domain with a slash 
And some tests for other situations
parse domain/user with String.lastIndexOf() instead of a File object
 2013-01-03 11:56:09 +01:00
Everett Toews 23c8c017b7 Copied test over from labs/openstack-cinder that got missed in the move to apis/opopenstack-cinder. 2013-01-02 20:29:32 -06:00
Adrian Cole 9237f1a406 eliminated errors when multiple groups have the same name 2013-01-01 22:16:28 -08:00
Adrian Cole b582d4a4a8 added recent aws instance types 2013-01-01 22:15:59 -08:00
Adrian Cole bd4f5cfba2 moved off deprecated TagClient -> TagApi; refactored tagging to occur at end of run 2013-01-01 19:19:33 -08:00
Adrian Cole 6e554298ab ensure extra metadata from provider doesn't trip metadata tests 2013-01-01 17:18:55 -08:00
Adrian Cole 42c7037a59 removed unused code or duplicated code; moved code only used once to where its used 2013-01-01 00:08:34 -08:00
Adrian Cole e1afa8c516 transitioned from FindResourceInSet to FluentIterable 2012-12-31 22:11:34 -08:00
Adrian Cole 9745e9dc2f fixed covariance and warnings on ApiMetadata subclasses 2012-12-31 19:40:49 -08:00
Adrian Cole c39503b682 TimeoutException is controllable via upping timeout properties; don't add more retry loops and stacktraces 2012-12-31 17:09:27 -08:00
Adrian Cole 2a3280fba5 removed AuthorizationException catch, as error handler already coerces auth exception to ResourceNotFound 2012-12-31 16:07:35 -08:00
Adrian Cole bb953c981e fix issue #1101: Move to Guava 14 BaseEncoding and Hashing 2012-12-31 14:48:31 -08:00
Everett Toews 8f0b38e5e1 Fixed Javadoc for Rackspace Cloud Files CDN. Links were broken. 2012-12-31 10:38:15 -06:00
Adrian Cole cddd35bc51 removed unnecessary generic types and made RestAnnotationProcessor immutable 2012-12-30 23:18:59 -08:00
Adrian Cole 2523ab54ac removed use of static fields to share type mapping info 2012-12-30 17:22:03 -08:00
Adrian Cole 038e550d2d moved off deprecated FluentIterable methods 2012-12-30 13:20:09 -08:00
Adrian Cole 13d8b9c402 replaced @Timeout w/explicit properties 2012-12-30 12:31:43 -08:00
Adrian Cole f2364eab26 Issue #1106: remove deltacloud 2012-12-29 13:08:21 -08:00
Adrian Cole 38152a5cc3 issue #1108: remove special casing of eucalyptus 2012-12-29 12:39:24 -08:00
Adrian Cole 7132683cf6 issue #1108: remove eucalyptus and related providers 2012-12-29 12:39:24 -08:00
Adrian Cole 69ba260738 issue #1107: remove walrus and related providers 2012-12-29 12:00:49 -08:00
Adrian Cole 4ef95df0e0 Merge pull request #1111 from jclouds/get-bucket-exists 
remove special casing of bucketExists relating to HEAD vs GET
 2012-12-29 11:45:54 -08:00
Adrian Cole 34156ca090 issue #1107: remove special casing of bucketExists relating to HEAD vs GET 2012-12-29 10:33:02 -08:00
Everett Toews 5a3c2449a1 Deleted nova project. Use openstack-nova instead. 2012-12-29 12:05:56 -06:00
Everett Toews f1d97e20c0 Deprecate nova project in 1.5.5. To be removed in 1.6. 2012-12-29 11:46:39 -06:00
Adrian Cole ba156b7552 Merge pull request #1100 from andrewgaul/close-payload 
Close Payload directly
 2012-12-27 18:26:05 -08:00
Andrew Gaul 614e262ce0 Close Payload directly 2012-12-27 17:35:25 -08:00
Adrian Cole 9b1872c6ff removed custom code that duplicates functionality of guava fallbacks 2012-12-27 16:54:31 -08:00
Adrian Cole 20c3426fc8 replaced jersey w/Uris & UriTemplates; removed complexity in url encoding and edge cases like matrix params 2012-12-24 14:32:59 -08:00
Everett Toews 976b6ef4a0 Guava toString, hashCode, and equals for domain objects. Removed unnecessary Objects. 2012-12-24 12:38:38 -06:00
Adrian Cole dadf142cac removed chance of race condition due to duplicate tearDown methods 2012-12-24 00:16:57 -08:00
Adrian Cole 847b1c7352 Merge pull request #1090 from jclouds/no-matrix 
removed explicit matrix param support as their use is edge case in rest
 2012-12-23 09:28:45 -08:00
Adrian Cole 3be1089538 removed explicit matrix param support as their use is edge case in rest 2012-12-22 17:45:31 -08:00
Adrian Cole 98a36eb3f6 added named annotations corresponding to IAM actions 2012-12-21 12:15:21 -08:00
Adrian Cole fbfd4aadc8 Merge pull request #1085 from rackspace/rax-clb-predicates 
Some useful predicates for Load Balancers.
 2012-12-20 16:22:24 -08:00
Everett Toews a48ec87ff8 Some useful predicates for Load Balancers. 2012-12-20 15:11:04 -06:00
Adrian Cole 8fc9a64240 Merge pull request #1082 from jclouds/cloudstack-no-bouncy 
cloudstack doesn't need a strict bouncycastle dep
 2012-12-20 11:57:59 -08:00
Adrian Cole 29aef26c60 ec2 doesn't need a strict dependency on bouncycastle 2012-12-20 10:24:21 -08:00
Adrian Cole 11e7c9dc72 cloudstack doesn't need a strict bouncycastle dep 2012-12-20 09:15:39 -08:00
Everett Toews ad6c257424 Added support for Iterable collections to QueryParam. 2012-12-20 10:48:48 -06:00
Everett Toews 0e14d32e73 Deprecated nova project in jclouds 1.6, to be removed in jclouds 1.7. 2012-12-19 15:50:37 -06:00
Everett Toews 3d83d788af Fixed issue where an Accept header is required when doing HEAD requests to Cloud Files. 2012-12-14 16:50:47 -06:00
Andrew Gaul 5b49b65bcd Merge pull request #1068 from rackspace/rax-clb-rename 
Renamed internal ID from cloudloadbalancers to rackspace-cloudloadbalancers.
 2012-12-13 11:20:32 -08:00
Everett Toews 0084dbeecb Fixed intermittent and changing test failures. 2012-12-13 12:39:05 -06:00
Everett Toews 01acb56df1 Renamed internal ID from cloudloadbalancers to rackspace-cloudloadbalancers. 2012-12-13 11:36:04 -06:00
Adrian Cole f071128f5a Merge pull request #1060 from rackspace/clb-modernize 
Modernizing the Rackspace Cloud Load Balancers API.
 2012-12-10 16:47:47 -08:00
Adrian Cole 2edc0ef19d Merge pull request #1056 from jclouds/jclouds-549-retry-after 
introduce RetryAfterException + make Nova use it
 2012-12-10 16:24:26 -08:00
Everett Toews 0b0373c91f Modernizing the Rackspace Cloud Load Balancers API. Following naming conventions and using PagedIterable. 2012-12-10 12:15:38 -06:00
Adrian Cole 059bd5ab05 removed redundant tests present in EC2ElasticBlockStoreClientExpectTest 2012-12-09 11:32:58 -08:00
Steve Loughran 04a528e823 integrated RetryAfterException into OpenStack Nova error response 2012-12-09 03:00:51 -08:00
Adrian Cole abd2fe19b7 Merge pull request #1041 from rackspace/clb-rename 
Renamed cloudloadbalancers to rackspace-cloudloadbalancers.
 2012-12-06 14:50:20 -08:00
Everett Toews 29fc4b855f Renamed cloudloadbalancers to rackspace-cloudloadbalancers. 2012-12-06 14:42:48 -06:00
Adrian Cole 6d6b53a5e0 fix issue #1040: tenant can be null 2012-12-06 11:15:01 -08:00
Everett Toews 1f1050777c Bringing Rackspace Cloud Load Balancers back to working condition. Fixed auth, zones, tests, bugs, logging, and dependencies. 2012-12-05 19:10:06 -06:00
Anton Panasenko e293e65538 Filter null organization in VCloud API 2012-12-04 19:36:54 +02:00
Adrian Cole 6563ba1ad9 Merge pull request #995 from LeanderBB/openstack-nova-diagnostics 
Started work on adding the nova diagnostics command to JClouds
 2012-12-04 07:47:31 -08:00
Adrian Cole c30fedec20 updated to employ Reflection.newProxy + AbstractInvocationHandler 2012-12-02 12:27:57 -08:00
Adrian Cole d801fcc157 Merge pull request #1016 from jclouds/flex-base64 
Flex base64
 2012-12-01 12:12:05 -08:00
Adrian Cole 39bf8f9897 Merge pull request #1014 from ahgittin/fix/cloudstack-niggles 
fix cloudstack network NPE, and 2 logging cleanups
 2012-12-01 11:12:17 -08:00
Alex Heneveld b7b3a4c333 log debug info at debug, not info 2012-12-01 09:54:19 -08:00
Alex Heneveld 29cd4efab3 no warning needed if it's admin or domain_admin rather than normal user 2012-12-01 09:54:19 -08:00
Alex Heneveld 95b220f26f the associatedNetwork is @Nullable so guard against (a fatal) NPE 2012-12-01 09:54:19 -08:00
Adrian Cole e66219c16e normalized to CryptoStreams 2012-11-30 17:33:53 -08:00
Leander Bessa Beernaert 38be08eb6b Extends JClouds' OpenStack Nova API with the Diagnostics command 
The diagnostics command returns a collection of system information
for the a given server. At the moment, there is no formal
specification for this command. Therefore, it is returned as
a Map of hypervisor specific entries and corresponding values.
More information about the command can be viewed here [1]
in the section "Server Diagnostics".

[1] http://api.openstack.org/api-ref.html
 2012-11-30 17:40:12 +00:00
Adrian Cole 2674c6d133 fix issue #917: incorrect require in security_group2.clj and elastic_ip2.clj 2012-11-30 09:21:57 -05:00
Anshul Gangwar 9acf58986c changed the access modifiers for constructors of DescribeInstancesResponseHandler and RunInstancesResponseHandler classes 2012-11-29 10:59:32 +05:30
Andrea Turli 84fc1a75e0 fixed registerISO and its tests 
adrian`s comments
RegisterISOexpectedTest added
removed ExceptionParser from registerISO test
 2012-11-28 08:42:26 +01:00
Adrian Cole c644b74c4c Fix CloudStack ISOClient.get and list ISOs based on test data from http://bugs.cloudstack.org/browse/CS-15572; refactored related tests to expect format 2012-11-27 10:57:13 -08:00
Andrei Savu 9a085e51a0 Issue 773. Support S3 Multi-Object Delete (API) 2012-11-26 16:11:55 +02:00
Adrian Cole 878ec1bcab undid Serializable and added checkstyle InterfaceIsType:allowMarkerInterfaces=false 2012-11-18 09:23:44 -08:00
Andrew Gaul b9e4543cdb Enforce no use of star imports via Checkstyle 2012-11-13 20:51:59 -08:00
Adrian Cole 7d6b268b7f added test for assigning cloudstack vm into an account 2012-11-13 18:57:33 -08:00
Andrew Bayer 06ff68706e Adding assignVirtualMachine command 2012-11-13 18:39:23 -08:00
Andrew Bayer bdb7b7b2c5 Adding ability to specify account and domain when creating CloudStack instances 2012-11-13 18:38:46 -08:00
Everett Toews c6aabb1a31 Moved openstack-cinder and rackspace-cloudblockstorage-us/uk out of labs. 
Updated pom.xml files for the move.
 2012-11-13 18:48:30 -06:00
Adrian Cole 34d9d05eca Merge pull request #988 from jclouds/dont-generate-when-user-supplies-groupnames 
Issue 1121: Don't generate SecurityGroup when user specifies securityGroupNames
 2012-11-13 10:11:04 -08:00
Everett Toews 39d90f954e Added Predicates for handling Volume and Snapshot Status. Improved some comments. 2012-11-13 11:08:30 -06:00
Adrian Cole 5a2af5c29e Issue 1121: Don't generate SecurityGroup when user specifies NovaTemplateOptions.securityGroupNames 2012-11-12 22:33:36 -08:00
Adrian Cole 6e492978fa javadoc fixes for TagApi 2012-11-12 22:09:58 -08:00
Adrian Cole 55c3f587f4 Issue 1110: replace TagClient with TagApi in aws-ec2 2012-11-12 18:30:30 -08:00
Adrian Cole bac869dce5 carve out EC2Api/EC2AsyncApi for new features 2012-11-12 17:30:02 -08:00
Andrew Gaul d7380114a6 Enforce use of Atomics.newReference via Checkstyle 
Avoids duplicating types.
 2012-11-12 11:56:48 -08:00
Andrew Gaul 4af8008b51 Address all existing Checkstyle violations 2012-11-12 10:30:46 -08:00
Andrew Gaul 3ad36d25d5 Enforce no unnecessary parentheses via Checkstyle 2012-11-10 13:22:12 -08:00
Andrew Gaul cca02ae02d Improve use of Splitter.omitEmptyStrings 2012-11-07 22:30:52 -08:00
Everett Toews 2682759b49 Moved the Volume Attachment stuff into its own API to make it totally clear to users that this is the API to use for attaching volumes. 2012-11-07 07:46:11 -06:00
Everett Toews 1636c1f89d Added Cinder service to Keystone test service catalog repsonses. 2012-11-06 14:43:03 -06:00
Andrew Gaul de82496aae Ensure simple boolean expressions via Checkstyle 2012-11-05 11:41:16 -08:00
Adrian Cole 64a8fd0cbb Merge pull request #961 from andrewgaul/checkstyle-collection-helpers 
Enforce use of Collection helpers via Checkstyle
 2012-11-05 11:38:49 -08:00
Adrian Cole 760824800e Merge pull request #959 from andrewgaul/checkstyle-multiple-variable-declarations 
Enforce a single variable declaration per line
 2012-11-05 11:36:32 -08:00
Adrian Cole 1ff91e508d Merge pull request #960 from andrewgaul/filesystem-blobkeys-container 
Ensure that callers get a well-behaving Set
 2012-11-05 11:26:59 -08:00
Adrian Cole 63602feb2c refactored cloudstack expect tests and added CloudStackComputeServiceAdapterExpectTest 2012-11-05 11:28:01 -03:00
Andrew Gaul 3d191253ec Enforce use of Collection helpers via Checkstyle 
This ensures that we do not repeat the type name.  Some instances remain
due to auto-generated code in dmtf/cim/Cim*.
 2012-11-04 20:45:49 -08:00
Andrew Gaul ffc2fb0eb4 Ensure that callers get a well-behaving Set 
Returning a container with a custom add method could confuse callers.
Provide same functionality via Function.
 2012-11-04 19:31:31 -08:00
Andrew Gaul 9d643b569a Enforce a single variable declaration per line 2012-11-04 17:37:16 -08:00
Adrian Cole 55025c0764 Merge pull request #954 from andrewgaul/specific-asserts 
Prefer specific asserts where possible
 2012-11-04 17:24:47 -08:00
Adrian Cole f1333801dd Merge pull request #953 from aledsage/Setting-RunScriptOnNode.Factory 
Setting RunScriptOnNode.factory
 2012-11-04 17:12:18 -08:00
Adrian Cole f4333157b9 make tests that decode credentials use valid base64 encoded strings 2012-11-04 15:37:49 -08:00
Andrew Gaul bfa3458b97 Prefer specific asserts where possible 2012-11-04 14:40:24 -08:00
Aled Sage 43d6155341 Set EC2 windows-template image id for testing 
- Identify the windows-template AMI using id rather than name-matching
 2012-11-04 22:29:52 +00:00
Andrew Gaul 0761874578 Prefer Assert.fail over assert 
The former cannot be disabled.
 2012-11-03 14:51:52 -07:00
Andrew Gaul 08b9982384 Enforce modifier order via Checkstyle 
Also fix violations, via:

find -name \*.java | xargs sed -i 's/final static/static final/'
find -name \*.java | xargs sed -i 's/static private/private static/'
find -name \*.java | xargs sed -i 's/static abstract/abstract static/'
 2012-11-01 20:01:30 -07:00
Andrew Gaul 88d53b8792 Enforce no empty statements via Checkstyle 2012-11-01 18:59:18 -07:00
Andrew Gaul 35ce78f15a Correct typos 2012-11-01 13:25:44 -07:00
Andrew Gaul b3da8e4603 Remove filesystem dependency on Apache commons-io 2012-10-30 20:48:58 -07:00
Adrian Cole 5da5161485 Merge pull request #909 from andrewgaul/clear-container-timeout-exception 
Throw TimeoutException from awaitCompletion
 2012-10-30 08:57:20 -07:00
Adrian Cole 7a46979e66 Merge pull request #922 from andrewgaul/checkstyle-newline-eof 
Enforce newline at end of file via Checkstyle
 2012-10-30 08:55:16 -07:00
Andrew Gaul fd26ba0d40 Simplify FilesystemAsyncBlobStoreTest.tearDown 
We should not swallow an IOException and resourcesToBeDeleted only ever
has one file.
 2012-10-30 03:01:44 -07:00
Andrew Gaul 93d69ece2b Enforce newline at end of file via Checkstyle 
Also address all warnings, via:

find -name \*.java | while read i; do if [ x`tail -c 1 $i` != x"" ]; then echo >> $i; fi; done
 2012-10-29 22:12:44 -07:00
Andrew Gaul 709ca69a2d Enforce that all imports are used via Checkstyle 
Also remove all unused imports, via:

mvn checkstyle:checkstyle -Dcheckstyle.output.file=/dev/stdout -Dcheckstyle.output.format=plain | tac | awk -v FS=: '/warning/{print "sed -i " $2 "d " $1}' | while read i; do $i; done
 2012-10-29 17:11:08 -07:00
Adrian Cole 3a00a2c389 Merge pull request #924 from andrewgaul/copyright-notice 
Address minor copyright notice typos
 2012-10-29 16:50:01 -07:00
Aled Sage 09425f4f69 Version upgrades 
- gson from 2.2 to 2.2.2
- guava from 13.0 to 13.0.1
- rocoto from 6.1 to 6.2
- log4j from 1.2.16 to 1.2.17
- log back from 1.0.0 to 1.0.7
- httpclient from 4.1.3 to 4.2.2
- netty from 3.3.1 to 3.5.9
- slf4j from 1.6.4 to 1.7.2
- testing from various to 6.8
- jetty from 8.1.1 to 8.1.7
- snakeyaml from 1.10 to 1.11
 2012-10-29 13:00:44 +00:00
Andrew Gaul e7dde3aff5 Address minor copyright notice typos 2012-10-28 23:27:56 -07:00
Andrew Gaul 336ccfa2e6 Throw TimeoutException from awaitCompletion 
This is a common error that callers should interpret correctly.  For
DeleteAllKeysInList, we integrate into its retry and backoff logic,
and for other callers, we continue to propagate RuntimeException.
 2012-10-25 13:50:29 -07:00
Adrian Cole 08516ff5d4 Merge pull request #907 from pandriani/master 
[CloudStack] allow "," as decimal separator in cpuUsed regular expression
 2012-10-24 20:08:03 -07:00
Andrew Gaul caccd9cf4c Prefer Files.copy to copy streams 2012-10-24 17:44:05 -07:00
Pasquale Andriani 256ba24dd0 added test for allowing ',' decimal separator 2012-10-25 01:04:19 +02:00
Pasquale Andriani dfbdc02ea4 Merge remote-tracking branch 'upstream/master' 2012-10-24 22:58:25 +02:00
Pasquale Andriani 8cde490aad allow "," as decimal separator in cpuUsed regular expression 2012-10-23 19:50:26 +02:00
Andrew Gaul 28d7a6f143 Prefer immutable over empty collections 
The former does not create an object when calling iterator(), as
discussed here:

https://groups.google.com/d/msg/jclouds-dev/l7BviKDXreA/mP6Ow_RYxIgJ
 2012-10-20 15:35:29 -07:00
Adrian Cole 081046d4d6 added S3 PagedIterable adapter 2012-10-18 17:27:32 -07:00
Adrian Cole 238fbceaaa additional test for EU create snapshot 2012-10-15 08:46:26 -07:00
Adrian Cole b49a3d555a Merge pull request #889 from jclouds/issue-1096 
Issue 1096: Guice errors when trying to get a signer for a keystone v2 password-auth BlobStore
 2012-10-10 04:06:33 -07:00
Adrian Cole ffa9cd3bb0 corrected guice bindings for swift-based blob signatures and backfilled expect tests 2012-10-10 12:03:23 +02:00
Andrew Bayer 24e485c829 Fixing CloudStack TemplateFilter enum to work with 3.x API properly 2012-10-09 12:31:44 -07:00
Adrian Cole 99d3422b4d added id to endpoint and used only endpoint.versionId to enforce endpointVersion 2012-10-08 15:59:04 -04:00
Adrian Cole a02c79c7f4 Merge pull request #887 from andreisavu/issue-973 
Issue 973. Performance problems with Synaptic's Atmos service
 2012-10-08 12:50:42 -07:00
Adrian Cole 14ad17108f Issue 671: NPE on aws-ec2 w/vpc security groups 2012-10-08 15:39:51 -04:00
Andrei Savu 0d8848b397 Replaced IllegalStateException with KeyAlreadyExistsException and fixed '\n' typo 2012-10-08 18:07:43 +03:00
Adrian Cole 363d996f19 Merge pull request #886 from andrewgaul/local_blob_request_signer 
Rename to LocalBlobRequestSigner
 2012-10-08 06:46:43 -07:00
Andrei Savu 03dc864115 Issue 973. Performance problems with Synaptic's Atmos service and writing new blobs 2012-10-08 16:26:40 +03:00
Andrew Gaul 9f6b9d4d8a Rename to LocalBlobRequestSigner 
Missing commit from the Filesystem and Transient unification.
 2012-10-07 22:54:03 -07:00
Andrew Gaul 9024c77405 Improve use of Charsets 2012-10-07 22:31:49 -07:00
Andrew Gaul 02e1a54220 Improve use of File constructor 2012-10-06 19:28:27 -07:00
Adrian Cole 5da084d6c4 Merge pull request #868 from andrewgaul/filesystem-get-all-container-names 
Simplify filesystem blobstore getAllContainerNames
 2012-10-05 10:10:57 -07:00
Andrew Gaul b8cd2b9ead Simplify filesystem blobstore getAllContainerNames 
This commit removes the dangerous behavior of calling File.delete in
Iterator.remove and helps migrate away from Apache commons-io.
 2012-10-05 09:34:33 -07:00
Adrian Cole 298856bab0 Merge pull request #876 from andrewgaul/log4j-line-wrapping 
Fix confusing line wrapping
 2012-10-04 16:36:04 -07:00