xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3116 commits 31 branches 40 tags 3.8 GiB
Commit graph

3116 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard Peter
e03283ad4a Merge branch 'omaha_13.5.1' (omaha_13.5.1-3) into development 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java

Change-Id: Idbf62886d6dbb4a4feeedb6ac17e8978cad2d59c

Former-commit-id: ad353c34f9 [formerly d262c02612] [formerly b007d4a302 [formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]
Former-commit-id: b007d4a302
Former-commit-id: af1099b3fb
 2013-06-24 18:51:56 -05:00
Richard Peter
be094a1745 Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	rpms/build/i386/build.sh

Change-Id: Ibfe5a34eb60b655ffd8d5f0a7a794648f778eb24

Former-commit-id: 0fa3bf800d [formerly 744eb64856] [formerly 37645245e5 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]
Former-commit-id: 37645245e5
Former-commit-id: a7594f8c93
 2013-06-24 18:36:15 -05:00
Ron Anderson
eedb35faed Issue #2122 Fix the build 
Change-Id: I28e57ea57e1dc70beaf538586d27f2f83b5cdf2a

Former-commit-id: ce42bdead7 [formerly f75554f1f7] [formerly f06a8baf2d [formerly bf3b00be422d690aa9646462556607335ef85fc0]]
Former-commit-id: f06a8baf2d
Former-commit-id: 6740c9e40f
 2013-06-24 18:03:52 -05:00
Richard Peter
fdad3e08b7 Merge "Issue #2126 - updated for Java 7 compatibility; compatible with both Java 6 and Java 7" into development 
Former-commit-id: a67d190612 [formerly 5f85aefff6] [formerly a19a946a24 [formerly ed31841e537d54ead391013919a94c879afd6f77]]
Former-commit-id: a19a946a24
Former-commit-id: 8481dd6bce
 2013-06-24 17:20:10 -05:00
Max Schenkelberg
c912e8e6c5 Issue #2122 Refactored satellite to use tile set renderable. Deleted old code 
Amend: Added fix for issue 2103
Amend: Added software history

Change-Id: I1e09bcbf28aaffbf602431a09af50da447e4cf2b

Former-commit-id: b4c0d1f715 [formerly 47b55981c8] [formerly 2f03c38ca0 [formerly e98002c1d18eefe039f0bfc9f1b90ef577d42547]]
Former-commit-id: 2f03c38ca0
Former-commit-id: bc4ebb4f08
 2013-06-24 15:48:37 -05:00
Bryan Kowal
a56679fa2a Issue #2126 - updated for Java 7 compatibility; compatible with both Java 6 and Java 7 
Former-commit-id: 2b8984c445 [formerly 5b85217ca2] [formerly cd2af684ca [formerly 9b6169bf7d86c9fa842f15aa6a8ba0777804be26]]
Former-commit-id: cd2af684ca
Former-commit-id: 7ebee00dc9
 2013-06-24 14:08:47 -05:00
Nate Jensen
1408ed3e1e Merge "Issue #2122 Cleaned up dependencies for satellite" into development 
Former-commit-id: d5897c323b [formerly 6541a89bf5] [formerly 0479cea2e6 [formerly e2577f5b9c5bd3d518dbaeb8f3a38ef57f3a8966]]
Former-commit-id: 0479cea2e6
Former-commit-id: a2c5c2a1a3
 2013-06-24 09:12:12 -05:00
Nate Jensen
f4a6354929 Merge "Issue #2121 add weather and discrete grid support to data access framework and add remove identifier ability for python interpreter requests" into development 
Former-commit-id: 8a76694b9f [formerly b1bd29e784] [formerly 69eec45f13 [formerly a0e0cb180cd59e79a30d0292899e36f69c711472]]
Former-commit-id: 69eec45f13
Former-commit-id: a44073cce6
 2013-06-24 09:10:01 -05:00
Steve Harris
deebdb874a 13.5.1-3 baseline 
Former-commit-id: d8176d4a4c [formerly 63803c1424] [formerly 72d22a30c9 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]
Former-commit-id: 72d22a30c9
Former-commit-id: 810388f00a
 2013-06-24 09:29:43 -04:00
Mike Duff
defc6a3080 Issue #2132 - Fix drawing lat/long box for madis point data 
Change-Id: Ie041c31726f6e51467b9d2730d662c431b42ac96

Former-commit-id: 7b3d79edc9 [formerly f685e73bd2] [formerly 14bd577f6c [formerly 380b50d8a3d2a3f80e5a69dd1980e8e863985c2a]]
Former-commit-id: 14bd577f6c
Former-commit-id: 65faaadc7c
 2013-06-21 14:59:03 -05:00
Dave Hladky
1f640b3173 Issue #2129 mkdirs call added to create directories at instantiation. 
Change-Id: I163e3f832e04af17da8a18196a10b50d30b8c83d

Former-commit-id: b781e784f9 [formerly 26398f6fb7] [formerly 0544a0cf88 [formerly b8ae6705e92e8816385cb2fce87175bbb4687d6d]]
Former-commit-id: 0544a0cf88
Former-commit-id: 57caa68867
 2013-06-21 11:13:04 -05:00
David Gillingham
2e14d2fda4 Issue #2111: Prevent possible NullPointerException in GridCanvas's mouse 
handler when attempting to display context menu.

Change-Id: I87fd5e790364028986e1a7872f4adf747b78bfee

Former-commit-id: 5490893942 [formerly 6b696c9e6a] [formerly 4f6c293a7e [formerly be9d6ed2d6c2a87afb5365abba0c9f09983550ec]]
Former-commit-id: 4f6c293a7e
Former-commit-id: 8b7a998bbf
 2013-06-20 16:31:43 -05:00
Dustin Johnson
7887201ebf Issue #2106 Fix setting of data size on gridded subscriptions 
Change-Id: I5dea937a9ad9f4691e58fb08a97ad6770cd8f925

Former-commit-id: 71da2985f7 [formerly b486e5f2fe] [formerly 554b43807e [formerly c9138bb9d844ed7c38df420734c2723321ad450b]]
Former-commit-id: 554b43807e
Former-commit-id: eaa3e47877
 2013-06-20 16:00:08 -05:00
Dustin Johnson
cf36003f12 Issue #1802 Fix event processing in regards to transaction commits/rollbacks 
Change-Id: If5988d96b7e7382e04879ca6126a61237d70bd22

Former-commit-id: a606508cd4 [formerly ecae75ecd8] [formerly a331cd2958 [formerly 25398fcce99b15d3fda71cad34f39222e30458dd]]
Former-commit-id: a331cd2958
Former-commit-id: d2faa3b600
 2013-06-20 13:53:04 -05:00
Dave Hladky
b2545d7408 Issue #2120 Fixed SSL connection problem 
Change-Id: I4a4e277ac75420bbaa621dcddb562e654211436c

Former-commit-id: 4a6248547a [formerly ffc9dc1ac9] [formerly 47d18e42ab [formerly 85d7c148e78a61025fa52f8c0996f99ab6075392]]
Former-commit-id: 47d18e42ab
Former-commit-id: 5d37e710d7
 2013-06-20 12:51:30 -05:00
Ben Steffensmeier
38f7211e99 Issue #2128 ensure setDataURI sets the dataURI. 
Former-commit-id: b507b6b1fd [formerly f02b073cc8] [formerly 68bb07f5fa [formerly 1fc3d7fb1ec9be3d34791cda89a1e808846dd82b]]
Former-commit-id: 68bb07f5fa
Former-commit-id: 69f1d9d812
 2013-06-20 11:11:37 -05:00
Lee Venable
953ad96305 Merge "Issue #2119 Added check when no selected lid." into omaha_13.5.1 
Former-commit-id: 3248909c85 [formerly 377bc28f63] [formerly 8b92b564d5 [formerly 2d05f18781938f3f52b70fcdcf7f1bcad60fe09e]]
Former-commit-id: 8b92b564d5
Former-commit-id: 9b564bef6a
 2013-06-20 09:22:36 -05:00
Matt Nash
6486801d2c Issue #2121 add weather and discrete grid support to data access framework and add remove identifier ability for python interpreter requests 
Change-Id: I8ede8f8149be84e58d10d30066e08d3c80d543e5

Former-commit-id: 0fe30ac2fb [formerly 54a114d789] [formerly 99e9194921 [formerly 95ec6db9b349890a29bd13860193ada39b43c294]]
Former-commit-id: 99e9194921
Former-commit-id: 4fa399c710
 2013-06-20 06:59:05 -05:00
Nate Jensen
d1b3b0f000 Merge "Issue #2116 Do not deactivate contexts for parts when closing an inactive perspective." into omaha_13.5.1 
Former-commit-id: a029fa7e57 [formerly b7b2602271] [formerly ba5c49fa61 [formerly de43ca9364a34a3ace5ef41da75c5a295c805339]]
Former-commit-id: ba5c49fa61
Former-commit-id: 622e1298d2
 2013-06-19 17:45:41 -05:00
Max Schenkelberg
992df9495e Issue #2122 Cleaned up dependencies for satellite 
Change-Id: I499946b9c5dceea6bf79bc272090e7109da6167e

Former-commit-id: ff96ed8a1a [formerly 262d72b786] [formerly c57439e5ef [formerly 2e115bc9cf0252978a98f4e890429a0aaf3972fa]]
Former-commit-id: c57439e5ef
Former-commit-id: 959639d118
 2013-06-19 17:24:30 -05:00
Richard Peter
af45d2db86 Merge "Issue #2125 clean up AnnotationBinder warning" into development 
Former-commit-id: 3a939f5898 [formerly 479ae9bf21] [formerly 7eb4d39903 [formerly bb65ab2f617ce671bfdc7231956956e881fc6deb]]
Former-commit-id: 7eb4d39903
Former-commit-id: 8c26fe8be2
 2013-06-19 16:41:39 -05:00
Richard Peter
bfd5e0929a Merge "Issue #1966 Check for modifications on close." into omaha_13.5.1 
Former-commit-id: c75874364d [formerly 36ed7d5d2b] [formerly 1fd38812ec [formerly 3c19aebeb235e8bf24e286007b27d5e8263731c6]]
Former-commit-id: 1fd38812ec
Former-commit-id: fd3cdedf8e
 2013-06-19 16:41:27 -05:00
Ben Steffensmeier
deacc7c250 Issue #2116 Do not deactivate contexts for parts when closing an inactive perspective. 
Former-commit-id: f238131378 [formerly 0e6f3ff5e6] [formerly 6de9e86090 [formerly 7a73d0897230c0a33d4be153e9ebbf9477b3e829]]
Former-commit-id: 6de9e86090
Former-commit-id: accd308f8b
 2013-06-19 16:35:41 -05:00
Roger Ferrel
dc0e31fcdd Issue #2119 Added check when no selected lid. 
Change-Id: Ia85dbc8957353ba44e94f7aa7b28cab0787165ac

Former-commit-id: 541b7fbc93 [formerly dc5059f06b] [formerly e7dc1184b1 [formerly 4a64a5b44a05a1c91b9a3d878ea0806e68c6d788]]
Former-commit-id: e7dc1184b1
Former-commit-id: 440ea0fc25
 2013-06-19 16:25:01 -05:00
Nate Jensen
a71d567d77 Issue #2125 clean up AnnotationBinder warning 
Change-Id: I5cd92a9d82527c0b2f3dd68e0f79c10c2db98b0f

Former-commit-id: dfa3d15cab [formerly 3f1fc8b367] [formerly 2bcaafac83 [formerly 8c1e060a42576ce0b5d9048f8e93ae07ef03e73b]]
Former-commit-id: 2bcaafac83
Former-commit-id: bdda4a11d5
 2013-06-19 15:56:32 -05:00
Bryan Kowal
624d423b10 Issue #1956 - dependency updates for EDEX dpa 
- relocated certain localization files based on the plugins that used them; when more than one plugin used the localization it was
  moved to the plugin that was a dependency of the other plugin that used it
- added the edex and common datadelivery service plugins to the core feature since there spring files are included in the dpa mode

Change-Id: Id1582abaa3e89a86289ce9ae615ac0997f60582d

Former-commit-id: cb8cb03d7d [formerly 8f479a2536] [formerly a877e9589c [formerly 914587220cb65cb22b788a5bf1e867cdf53cf5bf]]
Former-commit-id: a877e9589c
Former-commit-id: 09c48506e7
 2013-06-19 13:43:16 -05:00
Roger Ferrel
a2db3ff22c Issue #2110 RequestRouter.route(req) changed the class returned. 
Change-Id: I720402a177850a4ca798719aaace8bf3a42e552f

Former-commit-id: c6b4424fb7 [formerly f3a1c68d40] [formerly 4443dfd11a [formerly cda40b66492abf6a0064d28484b03e05500f7bed]]
Former-commit-id: 4443dfd11a
Former-commit-id: 7c7b1264d1
 2013-06-19 11:25:55 -05:00
Roger Ferrel
745c114b45 Issue #1966 Check for modifications on close. 
Change-Id: I88b17fb6406fd41ede46085a7a6b40149a387e83

Former-commit-id: 85d7e4aab9 [formerly 784a56f2ce] [formerly 67362de877 [formerly f6e51deb6cf7f50be7638b4670131cf39976944c]]
Former-commit-id: 67362de877
Former-commit-id: 259a66ac85
 2013-06-19 11:09:44 -05:00
Dustin Johnson
7b272f5c13 Merge "Issue #1956 - spring changes for minimal EDEX DPA install." into development 
Former-commit-id: 8476a54e1d [formerly de7d8fc970] [formerly 4993a17306 [formerly 39973de8b36242d0a979e484e77822a68db289ed]]
Former-commit-id: 4993a17306
Former-commit-id: 235b75021b
 2013-06-19 10:37:02 -05:00
Nate Jensen
afae330d8a Issue #1989 make camel stacktraces not get bunched up on a single line, consolidate log component settings to edex.xml 
Change-Id: I58f5081a0c4e55b1b4d47f2d9eecdea6152c86e6

Former-commit-id: c0f95eb55a [formerly 81fc4fa753] [formerly c4283b0336 [formerly 65a84967aa3afcef1f287fb769fd80f9dbf25349]]
Former-commit-id: c4283b0336
Former-commit-id: a9c077f0a9
 2013-06-19 10:16:06 -05:00
Dustin Johnson
a0d8e1dc0c Issue #2117 Separate log purging to its own Spring file for datadelivery/dpa 
Change-Id: I90ee9ac94ac97ab2c704ba131505531d834a3576

Former-commit-id: 1e7c85a592 [formerly 6f8246262b] [formerly 314331c9a4 [formerly 3a2ae4a33dcc29f6b5278c008c0117965040dd2f]]
Former-commit-id: 314331c9a4
Former-commit-id: dab308afc8
 2013-06-19 08:56:43 -05:00
Dave Hladky
552e2d0af3 Issue #2120 Updates to retrieval to fix time processing 
Change-Id: Ibedb988bb4b3806c037f5c8c1363f8233cf7cf2b

Former-commit-id: 01ef1cc0e8 [formerly f2177d48f6] [formerly 6110467a30 [formerly 5686d945729c28407e16625548050937158f9c65]]
Former-commit-id: 6110467a30
Former-commit-id: e466f536d0
 2013-06-19 08:35:50 -05:00
Bryan Kowal
227ee2c54b Issue #1956 - spring changes for minimal EDEX DPA install. 
Change-Id: Ia1b25b81ea49a3391409b32a31a5811d2e983904

Former-commit-id: 7d2304f4c2 [formerly 2896039f9f] [formerly a3736d3b87 [formerly 66cfe69bb6653dd43a0740a87a55ad19fe74a362]]
Former-commit-id: a3736d3b87
Former-commit-id: 5495e6e77f
 2013-06-18 17:21:21 -05:00
Dustin Johnson
b2cb6803fd Merge "Issue #2113 Improved MADIS ingest to be more resource frugal, target version fixed" into development 
Former-commit-id: d6bedc07ce [formerly 8d139f3325] [formerly 2e1d54e686 [formerly 4979a93f2cf0d697d4565641be3de40f4e1e4610]]
Former-commit-id: 2e1d54e686
Former-commit-id: 728f54c6ea
 2013-06-18 13:55:51 -05:00
Dave Hladky
d35f214dd0 Issue #2113 Improved MADIS ingest to be more resource frugal, target version fixed 
Change-Id: I0495187f7fbec1ed8c7c476ede2bc8384e054fb8

Former-commit-id: da1ea1f213 [formerly 235484e91d] [formerly 6ea9d25f9f [formerly 75a57b55a997db3edbf9829146b424b8da90cc77]]
Former-commit-id: 6ea9d25f9f
Former-commit-id: 7df10e06ae
 2013-06-18 13:40:02 -05:00
Dustin Johnson
e7a679ebc7 Issue #2117 Revert changes to configurable hibernate dialect, fix ebxml thrift service camel route 
Change-Id: I3a5bd49f128ed8918033fef4248bcdd5a57d0ad7

Former-commit-id: b9d8e444b3 [formerly 9bc7c854ab] [formerly 7ee918a548 [formerly 6c9c92fa660197bf5628da9d4d75e0ef2025aac1]]
Former-commit-id: 7ee918a548
Former-commit-id: 50cb2e26a2
 2013-06-18 12:34:25 -05:00
Nate Jensen
03ac5d60e6 Merge "Issue #2100 - export EDEX_BITS earlier" into development 
Former-commit-id: b90c4e32e7 [formerly 572d9b7dc7] [formerly c01eac48d9 [formerly 6ef49b301bd748d693f9f717ec186f2b5d0cd4ad]]
Former-commit-id: c01eac48d9
Former-commit-id: 0873b84720
 2013-06-18 09:14:31 -05:00
Steve Harris
cf11c28c9f Merge branch 'omaha_13.5.1' into development 
Former-commit-id: 0166f071d6 [formerly 1e5ef65d03] [formerly cb95c711fd [formerly bd6f53a77dade36b2fdc3057f5823562d5d11d4b]]
Former-commit-id: cb95c711fd
Former-commit-id: 33bbec83ea
 2013-06-18 09:04:11 -05:00
Roger Ferrel
28342fdfed Issue #1966 Column sort added; bug fixes to size estimates and saving files. 
Change-Id: Idbce325b98281732312205d093ca09bd5313bcaa

Former-commit-id: e16bfeee80 [formerly f175b19a93] [formerly c7c27c4cbb [formerly 195ba96c259535f00df44767c5dbc8777ece0e4c]]
Former-commit-id: c7c27c4cbb
Former-commit-id: cc39af5044
 2013-06-18 08:56:54 -05:00
Richard Peter
843cf307e8 Issue #1977: Fix merge, remove duplicate method alterProductParameters 
Change-Id: I8ac066011f7ef2bfd6cd5941f38147e1127c19b2

Former-commit-id: 9d90349767 [formerly 9b8ef83ccb] [formerly 9f7739c7d5 [formerly 6a9a268de0fa84bc4b15ade022ba306d55508cf8]]
Former-commit-id: 9f7739c7d5
Former-commit-id: 1d706b3b72
 2013-06-17 19:01:20 -05:00
Bryan Kowal
f5af2ea95e Issue #2100 - export EDEX_BITS earlier 
Change-Id: I81cb45a6354c3bbd635369084d552d6aa34af420

Former-commit-id: da49d311e9 [formerly 0e01520e11] [formerly 9b1596dc0c [formerly 745ee1a76e2d9ff8fccfa46b588cde5e0862c0e1]]
Former-commit-id: 9b1596dc0c
Former-commit-id: abd96b92b7
 2013-06-17 15:57:18 -05:00
Bryan Kowal
5bb6ea92a7 Issue #2105 - ensure that the CAVE component rpms are dependent on the awips2-cave rpm 
Former-commit-id: 7739797147 [formerly cddb77b77b] [formerly 6d58e92913 [formerly 0cdf64059b2e4d0f3da14145595ac7e2c5f672cc]]
Former-commit-id: 6d58e92913
Former-commit-id: 8f6b0fef1a
 2013-06-17 15:46:23 -05:00
Steve Harris
251b3c1a9e Merge branch 'omaha_13.5.1' into development 
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/PointSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java

Former-commit-id: 12248cade1 [formerly 43316cbff9] [formerly 532d41787b [formerly df49d4d975e97a6b6c35e710dfd8244455eb21eb]]
Former-commit-id: 532d41787b
Former-commit-id: cb3e34813f
 2013-06-17 15:29:01 -05:00
Steve Harris
0e4504c0fa Merge branch 'master_13.5.1' into omaha_13.5.1 
Conflicts (self-resolved with kdiff3):
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java


Former-commit-id: 41748175b6 [formerly 97631f9c62] [formerly 40359c27c3 [formerly aac449bf94a60b1e2ab3bfcd2e97e310fd6ee414]]
Former-commit-id: 40359c27c3
Former-commit-id: 41fb06e6ea
 2013-06-17 15:25:32 -05:00
Steve Harris
ccd66c0724 13.5.1-2 baseline 
Former-commit-id: bc60b22f00 [formerly adb779323d] [formerly 3386330894 [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]
Former-commit-id: 3386330894
Former-commit-id: 3926dc20f7
 2013-06-17 15:01:22 -04:00
Dustin Johnson
2c54620889 Merge "Issue #2064 - Fixes for sort column in subscription manager and lat/lon text fields in area comp" into omaha_13.5.1 
Former-commit-id: 73ec15180f [formerly 4b387ae85b] [formerly 46914a095c [formerly 8418598ba30fa601b13bbe435618acc1a6d152c2]]
Former-commit-id: 46914a095c
Former-commit-id: 0e7a34ce2a
 2013-06-17 13:19:09 -05:00
Mike Duff
365d4be785 Issue #2064 - Fixes for sort column in subscription manager and lat/lon text fields in area comp 
Former-commit-id: 66d564dc43 [formerly 2fa207f744] [formerly e51778ae88 [formerly ecd47da65e0d1c9483f8b66568e655e434a2e442]]
Former-commit-id: e51778ae88
Former-commit-id: 5c58b973ab
 2013-06-17 13:15:34 -05:00
Steve Harris
9f7e1049c9 Issue #1977 - removed i386-pc-linux-gnu.tar (should have stayed removed since 13.4.1) 
Former-commit-id: 6fe7610162 [formerly 477a86934c] [formerly c5c8b4a121 [formerly 1ce91abc2a3e4d12464e905e1d98ec4eb2179ca6]]
Former-commit-id: c5c8b4a121
Former-commit-id: eb16dd8a45
 2013-06-17 12:53:03 -05:00
Nate Jensen
cdc086d4d0 Merge "Issue #1924 - standardize build.properties files" into development 
Former-commit-id: 146d8d957a [formerly 41cb1a6552] [formerly 3a18f54f1c [formerly 2f6157b0bfca10462e5df7a29205d571a1112b0b]]
Former-commit-id: 3a18f54f1c
Former-commit-id: 0241ff964d
 2013-06-17 12:31:19 -05:00
Dustin Johnson
4c95affcf5 Merge "Issue #2106 Correct connection password logic, fix test code" into development 
Former-commit-id: ab59208eed [formerly 335888961f] [formerly a61c26d0e4 [formerly 692965c3f516dd5fcb6aee2a96df88e94d2af323]]
Former-commit-id: a61c26d0e4
Former-commit-id: ea165c6de6
 2013-06-17 11:32:32 -05:00