Commit graph

2964 commits

Author SHA1 Message Date
Nate Jensen
e2f072f2d5 Merge "Issue #1735 Speed ups for AcarsSoundingRecords and conversion to ThriftClient in MonitorDataUtil." into omaha_13.4.1
Former-commit-id: b24ccfd7a3 [formerly b24ccfd7a3 [formerly bc12d9c818b72ae16c485a33719817bd15301bca]]
Former-commit-id: a422709ab6
Former-commit-id: 32ea01b8b8
2013-04-12 12:39:12 -05:00
Richard Peter
153e552f8a Issue #1845: Fix gfeNotify with java qpid broker
Change-Id: I792b4598a296dcd7a8bafbd89c184dc709fdc193

Former-commit-id: 025600f4cb [formerly 025600f4cb [formerly 9f3806e9579cef66d0a40a290d9d36a089f2b3d6]]
Former-commit-id: a6ffc663a9
Former-commit-id: 207b4cafcc
2013-04-12 12:04:54 -05:00
Benjamin Phillippe
d9b5511b8b Issue #1802 Implemented ebxml registry replication
Change-Id: I9ddcb2f3a8410e5bae8f03b4c881625ecef8a531

Former-commit-id: 120906de78 [formerly 120906de78 [formerly 078545ff0fdbd591ebf69f22eb2e8400386c2bdf]]
Former-commit-id: ec69cdeb44
Former-commit-id: c0099a8a39
2013-04-12 11:27:45 -05:00
Roger Ferrel
94c372088d Issue #1735 Speed ups for AcarsSoundingRecords and conversion to ThriftClient in MonitorDataUtil.
Change-Id: Iaa88a15c0406bf5b0c9ffeb5af7f31701be226a9

Former-commit-id: 842852d975 [formerly 842852d975 [formerly 7cf9c217010a260281480eccdcc4e0b8d83fcd1f]]
Former-commit-id: 4c15be46a0
Former-commit-id: e3bacfb9f0
2013-04-12 11:10:13 -05:00
Bryan Kowal
28570210c6 Issue #1901 - EDEX will no longer automatically be killed during shutdown
Former-commit-id: 36fa6f932b [formerly 36fa6f932b [formerly 5b6452684b4a64620586e265f54dbcfa15c974ff]]
Former-commit-id: 81423bdca1
Former-commit-id: 694e7fe9ee
2013-04-12 10:36:15 -05:00
David Gillingham
30493697f8 Issue #1898: Modify service backup export_configuration script to also include site's map bundles.
Former-commit-id: d5c8ecc6d3 [formerly d5c8ecc6d3 [formerly d197bc7fef0ca97f533d5270625b5e696ab29dca]]
Former-commit-id: 7303425900
Former-commit-id: b6201bba2f
2013-04-12 09:50:47 -05:00
Nate Jensen
0b2851bb05 Merge "Issue #1871 convert parameters to Strings and make sure to return them" into development
Former-commit-id: e8218d0e3c [formerly e8218d0e3c [formerly e9df9576305b7d58b92de6917675f8c38c020270]]
Former-commit-id: fe163c5c16
Former-commit-id: e6a24551af
2013-04-12 09:31:52 -05:00
Matt Nash
6969b0c0ae Issue #1871 convert parameters to Strings and make sure to return them
Change-Id: I18063a0be05646b98404eea2225fc7a0f5d95ea7

Former-commit-id: cd77308fac [formerly cd77308fac [formerly 429b21c5f258fa9cd267933506bfe7091bb0e30b]]
Former-commit-id: 6c488cee05
Former-commit-id: 7dd72ab7d5
2013-04-12 09:31:23 -05:00
Matt Nash
7b25f73a9a Issue #1871 add default values for times so they don't need to be sent in from
Python, move getLatLonCoords()

Change-Id: Ic37728e269a9899adaf8be1c6d86cd644f417ba1

Former-commit-id: 3af61d7117 [formerly 3af61d7117 [formerly 01971b490beee0cc87df4ed478c3a66bbad2158f]]
Former-commit-id: b44ee44664
Former-commit-id: c95e825d35
2013-04-12 09:31:16 -05:00
Matt Nash
af190ad278 Issue #1871 make Java data access class better match Python version
Change-Id: Ic3ab7e771add58a693420a16a349e8208852a051

Former-commit-id: 68c84fd8cc [formerly 68c84fd8cc [formerly 21a59e4f9ab0e5a870b764259a1a0fc102f3b86f]]
Former-commit-id: 4ac6480f52
Former-commit-id: 7ffd8efcf2
2013-04-12 09:31:07 -05:00
Nate Jensen
7c22745ac0 Merge "Issue #1870 implement PathManager interface in Python to allow Python code to get files" into development
Former-commit-id: 36ad161721 [formerly 36ad161721 [formerly f4c7a9294f6218b40e582ba5e5dc8faacf52436e]]
Former-commit-id: 8561b201d5
Former-commit-id: 826e64a990
2013-04-12 09:30:38 -05:00
Matt Nash
d6feca69b4 Issue #1870 implement PathManager interface in Python to allow Python code to
get files

Change-Id: I0192c996533b1539194aaeba0213074bef8a4717

Former-commit-id: bf01f50e17 [formerly bf01f50e17 [formerly e3df8efa51ad95c952318b59edca702157a59856]]
Former-commit-id: 4b23ec7c0a
Former-commit-id: caf1f1fdf7
2013-04-12 07:55:56 -05:00
Bryan Kowal
f30c1fb3cf Issue #1897 - updated from PostgreSQL 9.2.3 to PostgreSQL 9.2.4
Former-commit-id: 331ca69086 [formerly 331ca69086 [formerly 64f31d1f7c2c01eee91cfb4de68fbc01a73ae113]]
Former-commit-id: 765569f139
Former-commit-id: 73e3d99f47
2013-04-11 18:06:42 -05:00
Steve Harris
a9d3e94b3b Issue #1872 - Merge branch 'master_13.3.1' (13.3.1-19) into omaha_13.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/src/gov/noaa/nws/ncep/common/dataplugin/ncscd/NcScdRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java

Former-commit-id: 55d9909d6d [formerly 55d9909d6d [formerly 6dced3d81d2733f9f7c5f3d54cb123bf8ba055b2]]
Former-commit-id: 0fed14d765
Former-commit-id: fe6a078c64
2013-04-11 13:14:00 -05:00
Steve Harris
28dca96d8f Issue #1862 - Tarfile part of: set_hydro_env now looks up db driver
Former-commit-id: 1de937229f [formerly 1de937229f [formerly ac202b9d79c530276e92a3e98ce097a8d1a620f2]]
Former-commit-id: bb0ad5b16a
Former-commit-id: 78b0a992f7
2013-04-11 12:49:31 -05:00
Lee Venable
b4fab18ed1 Merge "Issue #1862 - set_hydro_env now looks up db driver jar dynamically Peer review comments" into omaha_13.4.1
Former-commit-id: df3a446c96 [formerly df3a446c96 [formerly de28fa98b53242155213b7c66b54fe146166816d]]
Former-commit-id: 04713029bf
Former-commit-id: 09e0e0647a
2013-04-11 12:14:04 -05:00
Mike Duff
87421c52bb Issue #1862 - set_hydro_env now looks up db driver jar dynamically
Peer review comments

Change-Id: I6904da96e89930b6efa802ec6302cc7a7d36a3d9

Former-commit-id: d981d74087 [formerly d981d74087 [formerly c58285e63aa18eca991ebce3c408a298b09efe8c]]
Former-commit-id: 13542f3d70
Former-commit-id: 57cc934d76
2013-04-11 12:12:58 -05:00
Dave Hladky
cca803dac3 Issue #1886 double pfaf in mouseover text
Change-Id: I4f89aede6985126cfda5491b6df5bc4e18f34362

Former-commit-id: 7c1e2eddbc [formerly 7c1e2eddbc [formerly e1d484049e276877ef4327b5fbd8d722e1eda20c]]
Former-commit-id: 53fbf8815e
Former-commit-id: 8e1e4bb5f0
2013-04-11 09:06:03 -05:00
Bryan Kowal
435162efc7 Merge "Issue #1885 - the PostgreSQL data directory permissions will no longer be reverted to 775 during upgrades." into omaha_13.4.1
Former-commit-id: cce4b819c9 [formerly cce4b819c9 [formerly 655d6f29a5f9667dad6900a6dc2562968d8c8fcb]]
Former-commit-id: a792a0246b
Former-commit-id: 7f482f0335
2013-04-10 18:29:52 -05:00
Bryan Kowal
cd5d97fb3b Issue #1885 - the PostgreSQL data directory permissions will no longer be reverted to 775 during upgrades.
Former-commit-id: c28286b9ef [formerly c28286b9ef [formerly f49bb80458be42996555e5692a3403f2befad77b]]
Former-commit-id: ef5dcf4489
Former-commit-id: 3baf4ada50
2013-04-10 18:27:52 -05:00
Richard Peter
d59374ef90 Merge "Issue #1805 - incremented the python qpid release" into omaha_13.4.1
Former-commit-id: d8a0b43df2 [formerly d8a0b43df2 [formerly ac8837195f4861988b39062b252e7e3fb7133ed5]]
Former-commit-id: 3fe70ff22c
Former-commit-id: a4c8810322
2013-04-10 16:58:17 -05:00
Richard Peter
c0e4cca8a4 Merge "Issue #1874 - created external properties files for specifying the number of grib decode threads" into omaha_13.4.1
Former-commit-id: a244fe0cd0 [formerly a244fe0cd0 [formerly cd417d34a230322f80dd48eb59416c938697320d]]
Former-commit-id: 7f25a86e4d
Former-commit-id: 830ec7274c
2013-04-10 16:57:38 -05:00
Bryan Kowal
c1202c7331 Issue #1805 - incremented the python qpid release
Former-commit-id: c146f1835b [formerly c146f1835b [formerly f2c5c819d91ad851d82444865b4279f85e13f791]]
Former-commit-id: 2bfd416f13
Former-commit-id: 6c7cad26f0
2013-04-10 16:49:20 -05:00
Bryan Kowal
2ac40dd058 Issue #1874 - created external properties files for specifying the number of grib decode threads
- there is now one property for the number of threads
- the property is now used to set the number of concurrent consumers

Change-Id: I5e0c39928d1f3b92ad2875e6b720c9dde1b779ff

Former-commit-id: eb04d2b85f [formerly eb04d2b85f [formerly deeab1e1074fec2d62e55760d9fe45ec7379b9f8]]
Former-commit-id: b5994702dc
Former-commit-id: a60f14f5d6
2013-04-10 16:24:39 -05:00
Ron Anderson
01edd8acd2 Issue #1854 Fix for compatibility with PostGIS 2.0
Change-Id: I5b6ff34c823302b8db466d8e27130904bf4b82c3

Former-commit-id: dd10f6799b [formerly dd10f6799b [formerly 06158e2d3486770e0aeda370f12e49356d15d440]]
Former-commit-id: fcacf03de0
Former-commit-id: 59990c15cf
2013-04-10 15:57:05 -05:00
Nate Jensen
ccae7d873f Merge "Issue #1896 Make FFMPResource work better with D2D time matcher." into omaha_13.4.1
Former-commit-id: 2e6f8d874e [formerly 2e6f8d874e [formerly db2d869900335634e9976370b7154baad4415ab2]]
Former-commit-id: e6c7729470
Former-commit-id: 9ee54a18f7
2013-04-10 14:57:43 -05:00
Dustin Johnson
66136037bb Merge "Issue #1891 Fix sorting in pending subscription table" into development
Former-commit-id: 355e654c1e [formerly 355e654c1e [formerly f1360b8ef80c343ad16b2345c500ea48c17ba209]]
Former-commit-id: d117a40e7c
Former-commit-id: d149e51484
2013-04-10 14:50:14 -05:00
Richard Peter
70b9220889 Merge "Issue #1893 Switch machine to be LOCAL instead of using RuntimeMXBean" into omaha_13.4.1
Former-commit-id: 060cf5b326 [formerly 060cf5b326 [formerly 203a91a2d673329199e9fecc8bf2f171bd524cc2]]
Former-commit-id: a31dec3cc8
Former-commit-id: 558812ff6e
2013-04-10 14:40:36 -05:00
Nate Jensen
1f67a67ef5 Merge "Issue #1786 - Initial checkin of https for thin client Code review comments" into omaha_13.4.1
Former-commit-id: 7ca6107be4 [formerly 7ca6107be4 [formerly b4e2ee48a9ce2f5d751a2b18c0c945f51c162324]]
Former-commit-id: f59a8b3d4c
Former-commit-id: 891bcbe543
2013-04-10 14:35:06 -05:00
Ben Steffensmeier
ec5daf4cb0 Issue #1896 Make FFMPResource work better with D2D time matcher.
Former-commit-id: 6637ae7c0e [formerly 6637ae7c0e [formerly 8253598d2f19321c86a1d2da2a6b634a5ae7cd31]]
Former-commit-id: f58e1fe7b4
Former-commit-id: c321a387fc
2013-04-10 14:30:50 -05:00
Ben Steffensmeier
ea7aa6d647 Issue #1893 Switch machine to be LOCAL instead of using RuntimeMXBean
Former-commit-id: d727b93273 [formerly d727b93273 [formerly f9eb42deebaab88fb9f1bbee54537e62acdc72fa]]
Former-commit-id: d0070fcec4
Former-commit-id: 0ac1b41eeb
2013-04-10 14:09:47 -05:00
Dustin Johnson
6ee0d474f8 Issue #1891 Fix sorting in pending subscription table
Amend:  Rename getRowData() to getDisplayData()

Change-Id: Icc433f289d87273524468d0cf4e1bc799df134aa

Former-commit-id: d9544f3b73 [formerly d9544f3b73 [formerly b37624ebadc626e3dc30f669881d0b7bb87a7c45]]
Former-commit-id: 36cdd94a65
Former-commit-id: f7505eefc2
2013-04-10 14:04:55 -05:00
Mike Duff
c1a7a62e5b Issue #1786 - Initial checkin of https for thin client
Code review comments

Change-Id: I1fde9a276ecca44d87603be08a99232a5d7b441e

Former-commit-id: b9abbcdf37 [formerly b9abbcdf37 [formerly 6f206dad8ffbbd7b793b92b8a23bbce74a5b0017]]
Former-commit-id: 0a33734e6f
Former-commit-id: fd55f6ed42
2013-04-10 10:29:33 -05:00
Max Schenkelberg
0b2fed1f34 Issue #1638 Added cache of PluginDao objects in PluginFactory so they can safely cache data internally by not being recreated every store operation. Added default names to sample actions
Amend: Create copy on write for PluginFactory

Change-Id: I5373d1efadc1ab3c5e368a3caae55a5ff85a2d6f

Former-commit-id: 6e70b21f5f [formerly 6e70b21f5f [formerly 4249c63fb4ee62862cb9bbaa36d47607ba6784e8]]
Former-commit-id: b695de3698
Former-commit-id: f2a0f8223a
2013-04-10 10:04:17 -05:00
Bryan Kowal
140a08b73a Issue #1844 - declare table headers before sorting the table rows in qpid-queue-count.
Former-commit-id: da7371618c [formerly da7371618c [formerly 4f86b9cf6cf5e586199a08d2a470e232b1a8da1e]]
Former-commit-id: b956f09b37
Former-commit-id: 063f0ed761
2013-04-09 16:09:40 -05:00
Bryan Kowal
e856cfb853 Issue #1844 - updated the description for the "-s" argument in the usage message.
Former-commit-id: 42542eb9bb [formerly 42542eb9bb [formerly 87c038167dae3c211ec01615c007df24ae355704]]
Former-commit-id: e841aa070d
Former-commit-id: 0e62fa85f6
2013-04-09 15:45:40 -05:00
Bryan Kowal
5e92cd512c Issue #1844 - update qpid-queue-count and qpid-stat to use the new REST-based ws
- removed debug print statements
- currently, authenticating against the REST service is not supported; need to
  setup a qpid that requires REST authentication to ensure proper implementation

Change-Id: I9790f7a6678f30892ee3e5a29bcc8f2b5606b478

Former-commit-id: e5ee38d896 [formerly e5ee38d896 [formerly a45c818e6df529fb4e85f76cd5155a48c67fe0d9]]
Former-commit-id: 6811a31cd5
Former-commit-id: 02710de565
2013-04-09 14:21:09 -05:00
Dustin Johnson
0857b2766c Issue #1841 Update delta script for renaming PendingSubscription to PendingUserSubscription.
Change-Id: Ie1e485a5b8f5bce3032806fe3b0f4e78d46f93e6

Former-commit-id: bba3563265 [formerly bba3563265 [formerly d2a1704aa98f03086f7a07e416aa6aaea1d36121]]
Former-commit-id: ce96090763
Former-commit-id: 08a08803fe
2013-04-09 11:43:53 -05:00
Dustin Johnson
b61292ce4d Issue #1826 Remove delivery/notify options for subscriptions
Change-Id: Ife37bb70a5b54c3602d5f73de337cb83f37a9509

Former-commit-id: 11fd2d676b [formerly 11fd2d676b [formerly 0bf00ff025ea916aeb0ee4cb093163cbd9cfe931]]
Former-commit-id: 6bc69df127
Former-commit-id: b78f56f1ca
2013-04-09 11:40:25 -05:00
Bryan Kowal
3a8e2159de Issue #1805 - restore the full nightly delta build.
Former-commit-id: 6beda99aee [formerly 6beda99aee [formerly a0a625006c1fec5c6825e390b1dfd1e539ca318c]]
Former-commit-id: 837a65494f
Former-commit-id: a4d8303e2d
2013-04-09 09:56:38 -05:00
Steve Harris
7d76371536 13.3.1-19 baseline
Former-commit-id: 9be238bcc4 [formerly 9be238bcc4 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]
Former-commit-id: abaf9f12f9
Former-commit-id: 340a2cfb23
2013-04-09 08:37:12 -05:00
Richard Peter
0c2f84de7f Merge "Issue #1293 - remove hdffileid and create delta script to update existing databases" into omaha_13.4.1
Former-commit-id: aba25dc7c4 [formerly aba25dc7c4 [formerly ecf4556f6bf0b1ca13013a0f5143a0f840218a13]]
Former-commit-id: e95911f615
Former-commit-id: afef66b87e
2013-04-08 14:20:09 -05:00
Bryan Kowal
7bfabf4a4e Issue #1293 - remove hdffileid and create delta script to update existing databases
- now in the 13.4.1 branch


Former-commit-id: 4cc9a742c8 [formerly 4cc9a742c8 [formerly f58fa2c5360cdbf38580bb675d2acdc8cb6b438e]]
Former-commit-id: c08190a586
Former-commit-id: 55f234c2d1
2013-04-08 14:04:05 -05:00
Steve Harris
ee08ef663f Issue #1872 - added the edexOsgi/build.edex/esb/bin/yajsw/ content for rpm builds
Former-commit-id: 53492c2902 [formerly 53492c2902 [formerly da94d1f4ffc37edd53f17118c0b4420dd6500099]]
Former-commit-id: 84370207a1
Former-commit-id: 0105f15306
2013-04-08 13:47:34 -05:00
Greg Armendariz
190d2b79ad Issue #1872 - Add Jensen's build fix
Former-commit-id: fba9de785d [formerly fba9de785d [formerly ea5a1fa7de2acd53dcdb510ed42326153857a146]]
Former-commit-id: 0e2b440b86
Former-commit-id: ea340322bb
2013-04-08 12:26:20 -05:00
Dustin Johnson
fefc0dca3b Issue #1841 Split up PendingSubscription hierarchy in support of shared subscriptions.
Add ability to store/approve shared subscriptions.
Back out generics on subscription/pending subscriptions until guis are updated.

Change-Id: I84e1651ebcad0d398396752529981f28dbc341bf

Former-commit-id: 61346b1388 [formerly 61346b1388 [formerly 5a8249a78daaeed19079e78f6c4f07b08e817ff0]]
Former-commit-id: f3bdede2c8
Former-commit-id: 8c52cd190f
2013-04-05 12:41:02 -05:00
Bryan Kowal
0285965657 Issue #1873 - reduce EDEX shutdown time
Former-commit-id: bec051d00a [formerly bec051d00a [formerly 954e71e2a22252cf62041be5ee0c5de7f1418298]]
Former-commit-id: 82a1b0752e
Former-commit-id: 3bd9819e59
2013-04-04 17:36:09 -05:00
Dustin Johnson
64b2560d05 Issue #1872 Fix compile errors
Change-Id: Ic70a61c30bbe8ff4768a8079beb5be5f9336876a

Former-commit-id: 7cf482512d [formerly 7cf482512d [formerly 2b84d1a58c99858784294bf32b293f8a54c38ecd]]
Former-commit-id: 06e6d84273
Former-commit-id: add67ae3dc
2013-04-04 16:44:57 -05:00
Bryan Kowal
c97dccb62d Issue #1805 - restore the full nightly delta build.
Former-commit-id: 52be309cac [formerly 52be309cac [formerly 9dc700dbf0d7ff8347fda64bdd60879c267dd2f4]]
Former-commit-id: dc522ede44
Former-commit-id: 04e22df174
2013-04-04 16:16:53 -05:00
Roger Ferrel
da4b43a4fc Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned.
Change reviewer comments.

Change-Id: Ida69b63198ffa5c229eedd3abb42c4f5f9e1d00d

Former-commit-id: 998714524d [formerly 998714524d [formerly 882f96509c19f0621a4f6e6806e3177f6c566562]]
Former-commit-id: b00d64ec0a
Former-commit-id: 8c5f3fb8f7
2013-04-04 13:22:10 -05:00