Commit Graph

143 Commits

Author SHA1 Message Date
Apekshit(Appy) Sharma 1517deee67 HBASE-14400 Fix HBase RPC protection documentation
Signed-off-by: Andrew Purtell <apurtell@apache.org>

Conflicts:
	hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslUtil.java
2015-09-15 18:30:24 -07:00
stack 83e9fc485b HBASE-14435 thrift tests don't have test-specific hbase-site.xml so 'BindException: Address already in use' because info port is not turned off: ADDENDUM 2015-09-15 06:19:07 -07:00
stack 42b37d8c83 HBASE-14435 thrift tests don't have test-specific hbase-site.xml so 'BindException: Address already in use' because info port is not turned off 2015-09-14 20:00:58 -07:00
Sean Busbey a2dab027f6 HBASE-7972 allow configuring the TCP backlog on thrift services.
Author: Jean-Daniel Cryans
Ammending-Author: Esteban Gutierrez
Ammending-Author: Sean Busbey
2015-09-02 10:15:21 -05:00
Sean Busbey 71fbd4ac63 HBASE-14251 ensure javadoc jars have LICENSE/NOTICE that match content. 2015-08-20 11:20:47 -05:00
Andrew Purtell e8b5e922cb HBASE-14196 Thrift server idle connection timeout issue (Vladimir Rodionov)
Conflicts:
	hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
2015-08-12 16:40:58 -07:00
Lars Francke c07eb21e4b HBASE-14194 Undeprecate methods in ThriftServerRunner.HBaseHandler
Signed-off-by: Andrew Purtell <apurtell@apache.org>
2015-08-10 17:29:35 -07:00
Sean Busbey a45651c2cf HBASE-14085 Update LICENSE and NOTICE files.
* corrects license/notice for source distribution
* adds inception year to correct copyright in generated NOTICE files for jars
* updates project names in poms to use "Apache HBase" instead of "HBase" so jar NOTICE files will be correct
* uses append-resources to include supplemental info on jars with 3rd party works in source
* adds an hbase specific resource bundle for jars that include 3rd party works for binaries
** uses supplemental-model to fill in license gaps
** uses the above and a shade plugin transformation to build proper files for shaded jars.
** uses the above and the assembly plugin to build the proper files for bin assembly
* adds a NOTICE item for things copied out of Hadoop (TODO legal-discuss)

Conflicts:
	NOTICE.txt
	hbase-checkstyle/pom.xml
	hbase-resource-bundle/pom.xml
	hbase-server/pom.xml
	hbase-thrift/pom.xml
	pom.xml
2015-08-05 14:52:33 -07:00
Srikanth Srungarapu e3463d6bf0 HBASE-14162 Fixing maven target for regenerating thrift classes fails against 0.9.2 2015-07-31 14:59:13 -07:00
Sean Busbey 9091409800 HBASE-14087 Ensure correct ASF headers for docs/code
* adds missing headers
* corrects some old-form headers to current
* restores proper header for guava copied LimitInputStream
* adds proper header for protobuf copied read/writeRawVarint

Conflicts:
	bin/considerAsDead.sh
	dev-support/rebase_all_git_branches.sh
2015-07-31 11:22:50 -07:00
Sean Busbey f2f19ddb5c HBASE-13909 update branch-1 poms to 1.3.0-SNAPSHOT 2015-06-15 22:30:56 -05:00
Gábor Lipták 0a0ff3354a HBASE-13569 Correct Javadoc (for Java8)
Signed-off-by: Sean Busbey <busbey@apache.org>

Conflicts:
	hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
	hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
	hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java
	hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
	hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java
	hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterBase.java
	hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
	hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/constraint/ConstraintException.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionObserver.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileScanner.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MiniBatchOperationInProgress.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/util/BloomFilterWriter.java
2015-06-13 22:23:53 -05:00
Elliott Clark cecda74db1 HBASE-13700 Change Thrift2 so that number of woker threads can be passed in 2015-05-20 13:43:52 -07:00
Elliott Clark 81024a5b56 HBASE-13698 Add RegionLocator methods to Thrift2 2015-05-20 13:35:04 -07:00
Matt Warhaftig 5a87c3910e HBASE-13358 - Update VisibilityClient to accept Connection objects.
Signed-off-by: Srikanth Srungarapu <ssrungarapu@cloudera.com>
2015-04-30 21:21:41 -07:00
Usha Kuchibhotla 0dbbc8b8de HBASE-11677 Making Logger instance modifiers consistent.
* IA.Public accessible logger instances deprecated
* logger instances modified by tests left in place
* all others made private static final

Signed-off-by: Sean Busbey <busbey@apache.org>

Conflicts:
	hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientIdGenerator.java
	hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
	hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.java
	hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java
	hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java
	hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
	hbase-server/src/test/java/org/apache/hadoop/hbase/TestTableDescriptor.java
	hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRowCounter.java
	hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildHole.java
	hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildOverlap.java
2015-04-28 10:10:21 -05:00
Nick Dimiduk cf45c8d30a Bump pom version to 1.2.0-SNAPSHOT 2015-04-16 17:30:48 -07:00
tedyu 98a7481315 HBASE-13419 Thrift gateway should propagate text from exception causes (Michael Muller) 2015-04-13 09:57:19 -07:00
tedyu 0f0f3f8493 HBASE-12993 Use HBase 1.0 interfaces in hbase-thrift (Solomon Duskis) 2015-03-29 06:44:50 -07:00
Nick Dimiduk 242f62ffcd HBASE-13201 Remove HTablePool from thrift-server (Solomon Duskis) 2015-03-27 10:22:53 -07:00
tedyu 9d6aa4a8df HBASE-13327 Addendum replaced the nested try with a cast of getAdmin() to HBaseAdmin and a call to the original compact/majorCompact method (Solomon) 2015-03-26 17:59:24 -07:00
Elliott Clark 849343a66d HBASE-13265 Make thrift2 usable from c++ 2015-03-25 17:17:49 -07:00
tedyu 7c2525bf15 HBASE-13327 Use Admin in ConnectionCache (Solomon Duskis) 2015-03-24 18:15:09 -07:00
Josh Elser c3b47f2251 HBASE-13236 Add addt'l lifecycle-mapping executions.
Adds a number of lifecycle-mapping entries which
prevent errors from showing up in Eclipse on a fresh
import of HBase. For plugins defined in the top-level
pom, the mapping is added there; otherwise, the mapping
is pushed down to the child pom.

Signed-off-by: Sean Busbey <busbey@apache.org>
2015-03-14 00:19:44 -05:00
tedyu 6f24e4639f HBASE-13115 Fix the usage of remote user in thrift doAs implementation (Srikanth Srungarapu) 2015-03-03 06:49:30 -08:00
tedyu 0a21b1e226 HBASE-13069 Thrift Http Server returns an error code of 500 instead of 401 when authentication fails (Srikanth Srungarapu) 2015-02-19 16:36:00 -08:00
Enis Soztutar 9aac255509 HBASE-12919 Compilation with Hadoop-2.4- is broken again (Srikanth Srungarapu) 2015-01-26 11:05:32 -08:00
Nick Dimiduk 05f4e0c715 HBASE-12810 Update to htrace-incubating 2015-01-22 14:32:21 -08:00
Sean Busbey 0bec3a7bf4 HBASE-12898 ensure direct dependencies are declared. 2015-01-22 09:30:05 -06:00
tedyu bf94d64667 HBASE-12781 thrift2 listen port will bind always to the passed command line address (Pankaj Kumar) 2014-12-30 08:32:56 -08:00
tedyu 3021c060bd HBASE-12711 Fix new findbugs warnings in hbase-thrift module (Srikanth) 2014-12-18 19:32:39 -08:00
Enis Soztutar d66ae28c07 Update pom.xml version for 1.1.0-SNAPSHOT for branch-1 2014-12-17 23:16:41 -08:00
tedyu ebf9c9bce7 HBASE-12640 Addendum fixes TestThriftHttpServer (Srikanth Srungarapu) 2014-12-17 20:00:04 -08:00
Jimmy Xiang 2b665a780a HBASE-12640 Add Thrift-over-HTTPS and doAs support for Thrift Server -- ADDENDUM 2014-12-17 17:05:42 -08:00
Srikanth Srungarapu 85188d5d9d HBASE-12640 Add Thrift-over-HTTPS and doAs support for Thrift Server 2014-12-17 16:28:13 -08:00
stack f0afcd2cc2 HBASE-12689 Move version on from 0.99.2 to HBASE-1.0.0-SNAPSHOT 2014-12-14 20:37:59 -08:00
Enis Soztutar 4f22143dfa HBASE-12679 Add HBaseInterfaceAudience.TOOLS and move some of the Public classes to LimitedPrivate 2014-12-14 17:52:05 -08:00
Nick Dimiduk 081ce3f8de HBASE-12163 Move test annotation classes to the same package as in master 2014-12-08 10:38:58 -08:00
Enis Soztutar 5f150e49f9 Update pom.xml version for 0.99.2 2014-12-02 20:28:29 -08:00
Enis Soztutar 898e78661a HBASE-12072 Standardize retry handling for master operations
Conflicts:
	hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
	hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java
	hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
	hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java
	hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
	hbase-client/src/main/java/org/apache/hadoop/hbase/client/RowTooBigException.java
	hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/flush/MasterFlushTableProcedureManager.java
	hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicasClient.java
	hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java
2014-11-26 13:50:24 -08:00
Andrew Purtell a8734c3a4a HBASE-12279 Generated thrift files were generated with the wrong parameters (Niels Basjes) 2014-11-07 16:20:15 -08:00
Niels Basjes de21812ad5 HBASE-12272 Generate Thrift code using a maven profile
Signed-off-by: stack <stack@apache.org>

Conflicts:
	pom.xml
	src/main/docbkx/developer.xml
2014-11-06 10:32:41 -08:00
stack c99d89fd63 HBASE-12427 Change branch-1 version from 0.99.2-SNAPSHOT to 0.99.3-SNAPSHOT --REVERT 2014-11-05 19:15:24 -08:00
stack c66a6b02a5 HBASE-12427 Change branch-1 version from 0.99.2-SNAPSHOT to 0.99.3-SNAPSHOT 2014-11-04 12:41:38 -08:00
stack 6f4ae948ac HBASE-12355 Update maven plugins
Conflicts:
	hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaCache.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
2014-10-29 13:18:25 -07:00
Enis Soztutar 10ebc49130 Update pom.xml version to 0.99.2-SNAPSHOT 2014-10-17 11:32:59 -07:00
Enis Soztutar 7d0be32b1d Update pom.xml version for 0.99.1 2014-10-11 21:56:30 -07:00
Andrew Purtell 695261c4a9 HBASE-12106 Move test annotations to test artifact (Enis Soztutar) 2014-10-06 23:16:58 -07:00
Elliott Clark 91642eed82 HBASE-12076 Move InterfaceAudience imports to hbase-annotations 2014-09-24 04:01:58 -07:00
Elliott Clark c32af7df5f HBASE-12059 Create hbase-annotations module 2014-09-23 16:43:45 -07:00
Elliott Clark 7e6cb56e4c HBASE-12062 Fix usage of Collections.toArray 2014-09-23 10:00:03 -07:00
anoopsjohn 11e612c28c HBASE-12047 Avoid usage of KeyValueUtil#ensureKeyValue in simple cases. 2014-09-23 16:43:24 +05:30
Enis Soztutar 63c24ac73f Update pom.xml version to 0.99.1-SNAPSHOT 2014-09-22 20:14:52 -07:00
Enis Soztutar 6337705f26 Update pom.xml version for 0.99.0 2014-09-09 18:56:44 -07:00
Enis Soztutar b175042917 HBASE-11679 Replace HTable with HTableInterface where backwards-compatible (Carter) 2014-09-09 11:51:26 -07:00
stack 0bc349345a HBASE-11905 Add orca to server UIs and update logo 2014-09-05 16:43:08 -07:00
Jimmy Xiang 757ecdb14f HBASE-11474 [Thrift2] support authentication/impersonation 2014-07-13 15:14:57 -07:00
Jimmy Xiang dbfdf5bdb6 HBASE-11349 [Thrift] support authentication/impersonation 2014-07-08 13:01:34 -07:00
Ted Yu aa414085e6 HBASE-11422 Specification of scope is missing for certain Hadoop dependencies (Konstantin Boudnik) 2014-07-04 12:39:20 +00:00
Enis Soztutar 13bad28e93 HBASE-11391 Thrift table creation will fail with default TTL with sanity checks 2014-06-24 17:29:28 -07:00
Nick Dimiduk b18c7b122f HBASE-11371 Typo in Thrift2 docs (Cesar Delgado) 2014-06-17 16:22:58 -07:00
Ted Yu 1324a3cb18 HBASE-11052 Sending random data crashes thrift service 2014-06-17 16:03:16 +00:00
Michael Stack 26096f363e HBASE-10336 Remove deprecated usage of Hadoop HttpServer in InfoServer (Eric Charles) 2014-06-11 13:55:15 -07:00
Andrew Kyle Purtell 18afd4f39c Amend HBASE-10960 Enhance HBase Thrift 1 to include append and checkAndPut operations; Add missing file TAppend.java
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1590183 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 22:50:03 +00:00
Jonathan Hsieh ca303c699d HBASE-10960 Enhance HBase Thrift 1 to include "append" and "checkAndPut" operations (Srikanth Srungarapu)
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1590152 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 21:22:55 +00:00
larsh 16c6a00ac0 HBASE-10988 Addendum, break long line.
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1588018 13f79535-47bb-0310-9956-ffa450edef68
2014-04-16 18:26:28 +00:00
larsh e53b86fe92 HBASE-10988 Properly wait for server in TestThriftServerCmdLine.
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1588016 13f79535-47bb-0310-9956-ffa450edef68
2014-04-16 18:24:45 +00:00
nkeywal 4b762ee841 HBASE-10018 Change the location prefetch
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1585518 13f79535-47bb-0310-9956-ffa450edef68
2014-04-07 16:55:45 +00:00
liangxie b04e6a3cbd HBASE-10881 Support reverse scan in thrift2 (Liu Shaohui)
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1584509 13f79535-47bb-0310-9956-ffa450edef68
2014-04-04 02:59:44 +00:00
liangxie 6217e4367d HBASE-10887 tidy ThriftUtilities format
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1583593 13f79535-47bb-0310-9956-ffa450edef68
2014-04-01 10:12:40 +00:00
Michael Stack c4610ecab2 HBASE-10746 Bump the version of HTrace to 3.0
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1580076 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 22:46:03 +00:00
Enis Soztutar fbf2cc5377 HBASE-10635 thrift#TestThriftServer fails due to TTL validity check (Addendum patch to TestThriftServerCmdLine)
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1573814 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 23:46:57 +00:00
Enis Soztutar 6771203108 HBASE-10635 thrift#TestThriftServer fails due to TTL validity check
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1573447 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 05:48:04 +00:00
Andrew Kyle Purtell aee76671fe HBASE-10488 'mvn site' is broken due to org.apache.jasper.JspC not found
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1568869 13f79535-47bb-0310-9956-ffa450edef68
2014-02-17 00:48:42 +00:00
Andrew Kyle Purtell edb5f7c0ae HBASE-10173. Need HFile version check in security coprocessors
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1552503 13f79535-47bb-0310-9956-ffa450edef68
2013-12-20 06:41:53 +00:00
Michael Stack 57b8613688 HBASE_9955 Make hadoop2 the default and deprecate hadoop1; RETRY
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1548374 13f79535-47bb-0310-9956-ffa450edef68
2013-12-06 02:42:20 +00:00
Michael Stack fe5b28625a HBASE-9955 Make hadoop2 the default and deprecate hadoop1; REVERT
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1548351 13f79535-47bb-0310-9956-ffa450edef68
2013-12-06 01:16:51 +00:00
Michael Stack 7fbe97470e HBASE-9955 Make hadoop2 the default and deprecate hadoop1
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1548349 13f79535-47bb-0310-9956-ffa450edef68
2013-12-06 01:10:59 +00:00
Andrew Kyle Purtell f8139d1bf5 Update version in POMs to 0.99.0-SNAPSHOT after branching for release 0.98.0
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1547743 13f79535-47bb-0310-9956-ffa450edef68
2013-12-04 09:31:02 +00:00
ramkrishna 5f15ae4ade HBASE-9884 - Add Thrift and REST support for Visibility Labels (Ram)
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1546988 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 12:44:03 +00:00
ramkrishna 4e5847d331 HBASE-9882 - Support Append Operation with thrift (Ram)
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1545719 13f79535-47bb-0310-9956-ffa450edef68
2013-11-26 16:46:33 +00:00
nkeywal 38d454dc2b HBASE-10024 Add an interface to create put with immutable arrays
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1545592 13f79535-47bb-0310-9956-ffa450edef68
2013-11-26 10:05:44 +00:00
Michael Stack 164c0b29b4 HBASE-10021 Fix the REC_CATCH_EXCEPTION warning under hbase-thrift
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1545374 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 19:29:15 +00:00
jyates e5e5dac9a7 HBASE-9221: Provide interface for getting a User in the client
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1536937 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 00:02:52 +00:00
jxiang 04de6764ac HBASE-9693 Fix javadoc warnings
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1528938 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 17:02:23 +00:00
eclark ce7c5b8e03 HBASE-9699 For Downstreamers using HBaseTestingUtility is hard.
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1528645 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 21:59:19 +00:00
eclark 122082955e HBASE-9700 remove htrace-zipkin from the runtime dependencies
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1528622 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 21:01:37 +00:00
Michael Stack dc28ea6f17 HBASE-9610 TestThriftServer.testAll failing; ADDENDUM
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1526649 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 19:20:33 +00:00
Michael Stack e08500578c HBASE-9610 TestThriftServer.testAll failing
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1526281 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 20:08:49 +00:00
Michael Stack 527b15e101 HBASE-9610 TestThriftServer.testAll failing
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1525679 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 19:51:26 +00:00
Michael Stack 61e79ff6c9 HBASE-9610 TestThriftServer.testAll failing; DEBUGGING
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1525310 13f79535-47bb-0310-9956-ffa450edef68
2013-09-22 01:40:20 +00:00
eclark db22b2b6d9 HBASE-9597 ADD Create hbase-thrift module
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1525158 13f79535-47bb-0310-9956-ffa450edef68
2013-09-20 22:24:53 +00:00
eclark 10f0270f2c HBASE-9597 Create an hbase-thrift module
* Starting to create a thrift server module.
* Finished creating a thrift module
* Fix the assembly.
(cherry picked from commit 84e71a3469ec8eea1e0164bee3f7b2c9e0242847)
(cherry picked from commit 7fa170bd25e9b311b1cf268070ae05562d221f49)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1525139 13f79535-47bb-0310-9956-ffa450edef68
2013-09-20 20:44:22 +00:00