Milimetric has submitted this change and it was merged.
Change subject: merged cleanly
......................................................................
merged cleanly
Change-Id: I8f27f60010e2d729e534b5c6784399a4ae98f472
---
M kraken-etl/util.py
1 file changed, 0 insertions(+), 4 deletions(-)
diff --git a/kraken-etl/util.py b/kraken-etl/util.py
index 293e5d4..586de9d 100644
--- a/kraken-etl/util.py
+++ b/kraken-etl/util.py
@@ -190,11 +190,7 @@
)
).split('\n')
-<<<<<<< HEAD (a5753c Adding import logic for dumps pagecounts)
def basedir(self, topic, interval='hourly'):
-=======
- def basedir(self, topic, interval):
->>>>>>> BRANCH (8f7bbc Adding import logic for dumps pagecounts)
return self.destination_path + '/' + topic + '/' + interval
# TODO configure interval partition paths automatically instead of
hardcoding
--
To view, visit https://gerrit.wikimedia.org/r/89328
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8f27f60010e2d729e534b5c6784399a4ae98f472
Gerrit-PatchSet: 1
Gerrit-Project: analytics/kraken
Gerrit-Branch: master
Gerrit-Owner: Milimetric <dandree...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
