Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,094 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

126 Commits

Author SHA1 Message Date
Karthik Kambatla 3f48493bed HDFS-7274. Disable SSLv3 in HttpFS. (Robert Kanter via kasha) 2014-10-28 17:21:20 -07:00
Allen Wittenauer 828429dec1 HDFS-7232. Populate hostname in httpfs audit log (Zoran Dimitrijevic via aw) 2014-10-23 14:06:19 -07:00
arp bb84f1fccb HDFS-7159. Use block storage policy to set lazy persist preference. (Arpit Agarwal) 2014-09-29 22:27:59 -07:00
arp e0d7fb48fb Merge branch 'trunk' into HDFS-6581 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/Receiver.java
 2014-09-16 14:32:57 -07:00
Alejandro Abdelnur 932ae036ac HADOOP-10868. AuthenticationFilter should support externalizing the secret for signing and provide rotation support. (rkanter via tucu) 2014-09-15 17:05:42 -07:00
arp 339d21f273 Merge trunk into HDFS-6581 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
 2014-09-05 21:36:25 -07:00
Alejandro Abdelnur 70b218748b HADOOP-11015. Http server/client utils to propagate and recreate Exceptions from server to client. (tucu) 2014-09-04 09:11:10 -07:00
arp a7bcc95358 HDFS-6921. Add LazyPersist flag to FileStatus. (Arpit Agarwal) 2014-08-27 21:47:18 -07:00
Alejandro Abdelnur 065d9ec5d9 HDFS-6849. Replace HttpFS custom proxyuser handling with common implementation. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617831 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 20:27:50 +00:00
Alejandro Abdelnur be9c67930b HADOOP-10771. Refactor HTTP delegation support out of httpfs to common, PART 2. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616672 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 04:58:58 +00:00
Alejandro Abdelnur 4e7c4a6e1f HADOOP-10771. Refactor HTTP delegation support out of httpfs to common, PART 1. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616671 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 04:55:38 +00:00
Alejandro Abdelnur 2d7dcff6f4 HADOOP-10791. AuthenticationFilter should support externalizing the secret for signing and provide rotation support. (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616005 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 21:21:03 +00:00
Alejandro Abdelnur 46162a213f HDFS-6430. HTTPFS - Implement XAttr support. (Yi Liu via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1605118 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-24 15:59:50 +00:00
Alejandro Abdelnur 8bfbec8cfb HDFS-6379. HTTPFS - Implement ACLs support. (yoderme via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1602040 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-11 22:35:18 +00:00
Alejandro Abdelnur e4c06854b4 HDFS-6404. HttpFS should use a 000 umask for mkdir and create operations. (yoderme via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1598668 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-30 16:49:11 +00:00
Chris Nauroth 806f4d11f2 HADOOP-10602. Documentation has broken "Go Back" hyperlinks. Contributed by Akira AJISAKA. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1598337 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-29 17:26:50 +00:00
Arun Murthy 004d0854b7 HDFS-4564. Ensure webhdfs returns correct HTTP response codes for denied operations. Contributed by Daryn Sharp. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1583241 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-31 07:25:53 +00:00
Haohui Mai e90687f90e HDFS-5321. Clean up the HTTP-related configuration in HDFS. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574270 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-05 00:28:21 +00:00
Alejandro Abdelnur 5e09ae1633 HDFS-5703. Add support for HTTPS and swebhdfs to HttpFS. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1560504 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-22 20:38:24 +00:00
Steve Loughran 1a38b48026 HDFS-5075 httpfs-config.sh calls out incorrect env script name 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541692 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-13 20:19:41 +00:00
Andrew Wang 646fcc8a56 HDFS-5495. Remove further JUnit3 usages from HDFS. Contributed by Jarek Jarcec Cecho. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540914 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-12 01:56:56 +00:00
Jing Zhao 258c181ade HDFS-5352. Server#initLog() doesn't close InputStream in httpfs. Contributed by Ted Yu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532158 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-15 01:17:21 +00:00
Alejandro Abdelnur 3ed7c6e9e5 HDFS-4951. FsShell commands using secure httpfs throw exceptions due to missing TokenRenewer. (rknater via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1501451 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-09 18:41:26 +00:00
Alejandro Abdelnur 5b1b197d39 HDFS-4865. Remove sub resource warning from httpfs log at startup time. (ywskycn via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1487616 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-29 19:54:28 +00:00
Suresh Srinivas 9a43df8e5a HDFS-4825. webhdfs / httpfs tests broken because of min block size change. Contributed by Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1486386 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-26 02:11:37 +00:00
Aaron Myers c06bbc25e8 HDFS-4733. Make HttpFS username pattern configurable. Contributed by Alejandro Abdelnur. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1477237 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-29 18:05:04 +00:00
Suresh Srinivas d49c50732e HDFS-4287. HTTPFS tests fail on Windows. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1455605 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-12 16:35:09 +00:00
Alejandro Abdelnur bbdae834d2 HDFS-4456. Add concat to HttpFS and WebHDFS REST API docs. (plamenj2003 via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1441603 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-01 19:42:06 +00:00
Aaron Myers b3b9485271 HDFS-4415. HostnameFilter should handle hostname resolution failures and continue processing. Contributed by Robert Kanter. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1434951 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-17 23:08:47 +00:00
Suresh Srinivas e1ba3f8158 HDFS-4236. Remove artificial limit on username length introduced in HDFS-4171. Contributed by Alejandro Abdelnur. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1418356 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-07 15:23:49 +00:00
Alejandro Abdelnur 6f80a2a76c HDFS-4171. WebHDFS and HttpFs should accept only valid Unix user names. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1410824 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-18 04:10:29 +00:00
Robert Joseph Evans b2456ca3b8 svn merge -r 1409087:1409086 reverting HDFS-4171 until test failures can be fixed. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1409266 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-14 17:32:55 +00:00
Alejandro Abdelnur 368f628ce5 HDFS-4171. WebHDFS and HttpFs should accept only valid Unix user names. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1409087 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-14 06:12:03 +00:00
Thomas White 42f4691ead Add new files missed from HADOOP-8860 commit. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1408288 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-12 13:54:27 +00:00
Alejandro Abdelnur 016b86867b HDFS-3999. HttpFS OPEN operation expects len parameter, it should be length. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1394169 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-04 17:45:42 +00:00
Alejandro Abdelnur c419b1385d HDFS-3944. Httpfs resolveAuthority() is not resolving host correctly. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1386994 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-18 05:45:57 +00:00
Alejandro Abdelnur 0de9642514 HDFS-3938. remove current limitations from HttpFS docs. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1384842 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-14 16:28:47 +00:00
Suresh Srinivas deead78e35 HDFS-3844. Add @Override and remove {@inheritdoc} and unnecessary imports. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377168 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-25 01:03:22 +00:00
Daryn Sharp 8fa10b184e HADOOP-7967. Need generalized multi-token filesystem support (daryn) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1374271 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-17 14:05:11 +00:00
Jakob Homan ac31ae6a79 HDFS-3768. Exception in TestJettyHelper is incorrect. Contributed by Eli Reisman. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1370952 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-08 20:34:03 +00:00
Alejandro Abdelnur 754fd7b2fb HDFS-3291. add test that covers HttpFS working w/ a non-HDFS Hadoop filesystem (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1370387 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-07 17:43:32 +00:00
Alejandro Abdelnur 08e8966217 HDFS-3724. add InterfaceAudience annotations to HttpFS classes and making inner enum static. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1368308 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-01 23:14:08 +00:00
Alejandro Abdelnur fe17d871d0 HDFS-3513. HttpFS should cache filesystems. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1368304 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-01 23:09:19 +00:00
Alejandro Abdelnur c5fe08e0ea HDFS-3113 amendment, removing incorrectly committed files 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1365990 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-26 13:42:26 +00:00
Alejandro Abdelnur 4d4560189a HDFS-3113. httpfs does not support delegation tokens. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1365988 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-26 13:39:05 +00:00
Aaron Myers e2253b539e HDFS-3583. Convert remaining tests to Junit4. Contributed by Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1362753 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-18 03:46:28 +00:00
Eli Collins 06d635cd2c HDFS-3492. fix some misuses of InputStream#skip. Contributed by Colin Patrick McCabe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1361449 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-14 00:18:56 +00:00
Eli Collins 4a5ba3b7bd HDFS-3641. Move server Util time methods to common and use now instead of System#currentTimeMillis. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1360858 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-12 19:01:49 +00:00
Eli Collins 43e37b96f8 HADOOP-8586. Fixup a bunch of SPNEGO misspellings. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1360056 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-11 08:21:22 +00:00
Eli Collins 151a1b0185 Revert previous commit, accidentally included HADOOP-8587. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1360055 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-11 08:19:59 +00:00
Eli Collins c41b97860d HADOOP-8586. Fixup a bunch of SPNEGO misspellings. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1360048 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-11 08:10:00 +00:00
Alejandro Abdelnur 2b2344a57e HDFS-3575. HttpFS does not log Exception Stacktraces (brocknoland via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1356330 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-02 16:41:33 +00:00
Alejandro Abdelnur 5a8ea48c37 HDFS-3580. incompatible types; no instance(s) of type variable(s) V exist so that V conforms to boolean compiling HttpFSServer.java with OpenJDK (adi2 via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1355593 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-29 22:58:32 +00:00
Alejandro Abdelnur 34605c9594 HDS-3491. HttpFs does not set permissions correctly (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1355556 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-29 20:59:11 +00:00
Alejandro Abdelnur d263653ae2 HDFS-3481. Refactor HttpFS handling of JAX-RS query string parameters (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1354599 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-27 16:06:37 +00:00
Todd Lipcon 05a73a3a1e Revert HDFS-3492 from r1347192: patch broke TestShortCircuitLocalRead 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1347796 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-07 21:06:13 +00:00
Todd Lipcon bef65d0601 HDFS-3492. Fix some misuses of InputStream#skip. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1347192 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-06 22:48:48 +00:00
Eli Collins 22cb0ec82a HADOOP-8422. Deprecate FileSystem#getDefault* and getServerDefault methods that don't take a Path argument. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1342495 13f79535-47bb-0310-9956-ffa450edef68
 2012-05-25 04:10:15 +00:00
Alejandro Abdelnur e937068c0b HDFS-3460. HttpFS proxyuser validation with Kerberos ON uses full principal name. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1342334 13f79535-47bb-0310-9956-ffa450edef68
 2012-05-24 16:51:04 +00:00
Alejandro Abdelnur 84b36cfd80 HDFS-3309. HttpFS (Hoop) chmod not supporting octal and sticky bit permissions. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1331493 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-27 16:30:22 +00:00
Alejandro Abdelnur f4711ef3ab HDFS-3314. HttpFS operation for getHomeDirectory is incorrect. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1329715 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-24 13:46:25 +00:00
Alejandro Abdelnur 8bda086d04 HDFS-3263. HttpFS should read HDFS config from Hadoop site.xml files (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1327627 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-18 18:51:22 +00:00
Eli Collins e7444b2a07 HDFS-3160. httpfs should exec catalina instead of forking it. Contributed by Roman Shaposhnik 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1306665 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-29 01:16:02 +00:00
Uma Maheswara Rao G 3573d504e4 HDFS-3111. Missing license headers in trunk. (Contributed by Uma Maheswara Rao G). 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1301871 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-17 06:50:36 +00:00
Alejandro Abdelnur a0ee9adfd3 HDFS-3057. httpfs and hdfs launcher scripts should honor CATALINA_HOME and HADOOP_LIBEXEC_DIR (rvs via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1300637 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-14 17:01:34 +00:00
Alejandro Abdelnur 27035f532d HADOOP-8051 HttpFS documentation it is not wired to the generated site (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242987 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-11 00:03:00 +00:00
Alejandro Abdelnur 0d5b734681 HDFS-2840. TestHostnameFilter should work with localhost or localhost.localdomain (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236940 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-28 00:24:46 +00:00
Alejandro Abdelnur 8a234f394e HADOOP-7939. Improve Hadoop subcomponent integration in Hadoop 0.23. (rvs via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236929 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-27 23:53:35 +00:00
Alejandro Abdelnur a7091893de HDFS-2836. HttpFSServer still has 2 javadoc warnings in trunk (revans2 via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236328 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-26 17:58:42 +00:00
Harsh J 05ed36cd52 HDFS-2722. HttpFs should not be using an int for block size. (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1226861 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-03 16:47:49 +00:00
Alejandro Abdelnur ae0d48854d HDFS-2707. HttpFS should read the hadoop-auth secret from a file instead inline from the configuration. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1224794 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-26 19:37:25 +00:00
Alejandro Abdelnur 6b4f40cbf9 HttpFS server should check that upload requests have correct content-type. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221616 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-21 05:26:20 +00:00
Alejandro Abdelnur 8fe3dd3fea HDFS-2657. TestHttpFSServer and TestServerWebApp are failing on trunk. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221580 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-21 03:03:16 +00:00
Alejandro Abdelnur 45620eee68 HDFS-2646. Hadoop HttpFS introduced 4 findbug warnings. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221572 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-21 02:46:04 +00:00
Alejandro Abdelnur de928a4aa0 HDFS-2658. HttpFS introduced 70 javadoc warnings. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220810 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-19 15:53:53 +00:00
Alejandro Abdelnur 3334306512 HDFS-2178. Contributing Hoop to HDFS, replacement for HDFS proxy with read/write capabilities. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1212060 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-08 19:25:28 +00:00