<html>
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#FFFFFF">
SORRY hab herausgefunden war auf dem falschen PI eingeloggt ):<br>
<br>
Jetzt funktioniert wieder alles und das Update hat funktioniert.<br>
<br>
<br>
DANKE<br>
<br>
<br>
<div class="moz-cite-prefix">Am 18.12.2014 um 05:55 schrieb Daniel
Kopf:<br>
</div>
<blockquote
cite="mid:F0F02681-ECBE-491E-BE4E-3F95A460A05F@spider-wolf.de"
type="cite">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
Guten Morgen,
<div class=""><br class="">
</div>
<div class="">so ich habe heute morgen gleich mal getestet.</div>
<div class=""><br class="">
</div>
<div class="">
<div style="margin: 0px; font-size: 11px; font-family: Menlo;"
class="">git reset --hard HEAD composer.lock</div>
</div>
<div style="margin: 0px; font-size: 11px; font-family: Menlo;"
class=""><br class="">
</div>
<div style="margin: 0px; font-size: 11px; font-family: Menlo;"
class="">hatte ich folgende Meldung </div>
<div style="margin: 0px; font-size: 11px; font-family: Menlo;"
class=""><br class="">
</div>
<div style="margin: 0px; font-size: 11px; font-family: Menlo;"
class="">
<div style="margin: 0px;" class="">fatal: Cannot do hard reset
with paths.</div>
</div>
<div class=""><br class="">
</div>
<div class="">wenn ich </div>
<div class=""><br class="">
</div>
<div class="">
<div style="margin: 0px; font-size: 11px; font-family: Menlo;"
class="">sudo git checkout composer.lock</div>
</div>
<div style="margin: 0px; font-size: 11px; font-family: Menlo;"
class=""><br class="">
</div>
<div style="margin: 0px; font-size: 11px; font-family: Menlo;"
class="">ausführe kommt keine Meldung und nach dem Befehl</div>
<div style="margin: 0px; font-size: 11px; font-family: Menlo;"
class=""><br class="">
</div>
<div style="margin: 0px; font-size: 11px; font-family: Menlo;"
class="">sudo git pull</div>
<div style="margin: 0px; font-size: 11px; font-family: Menlo;"
class=""><br class="">
</div>
<div style="margin: 0px; font-size: 11px; font-family: Menlo;"
class="">
<div style="margin: 0px;" class="">remote: Counting objects: 19,
done.</div>
<div style="margin: 0px;" class="">remote: Compressing objects:
100% (19/19), done.</div>
<div style="margin: 0px;" class="">remote: Total 19 (delta 9),
reused 1 (delta 0)</div>
<div style="margin: 0px;" class="">Unpacking objects: 100%
(19/19), done.</div>
<div style="margin: 0px;" class="">From <a
moz-do-not-send="true"
href="https://github.com/volkszaehler/volkszaehler.org"
class="">https://github.com/volkszaehler/volkszaehler.org</a></div>
<div style="margin: 0px;" class=""> eceaec8..8929538 master
-> origin/master</div>
<div style="margin: 0px;" class="">Updating 3600dab..8929538</div>
<div style="margin: 0px;" class="">Fast-forward</div>
<div style="margin: 0px;" class=""> .gitignore
| 1 +</div>
<div style="margin: 0px;" class=""> .travis.yml
| 13 +-</div>
<div style="margin: 0px;" class=""> composer.json
| 12 +-</div>
<div style="margin: 0px;" class=""> composer.lock
| 1074
-----------------------------------------------------------</div>
<div style="margin: 0px;" class=""> gulpfile.js
| 69 ++++</div>
<div style="margin: 0px;" class=""> htdocs/frontend/images/blank.png
| Bin 0 -> 97 bytes</div>
<div style="margin: 0px;" class=""> htdocs/frontend/images/json.png
| Bin 0 -> 1065 bytes</div>
<div style="margin: 0px;" class=""> htdocs/frontend/images/sprites.png
| Bin 0 -> 22400 bytes</div>
<div style="margin: 0px;" class=""> htdocs/frontend/images/types/pipe.png
| Bin 0 -> 959 bytes</div>
<div style="margin: 0px;" class=""> htdocs/frontend/images/xml.png
| Bin 488 -> 1069 bytes</div>
<div style="margin: 0px;" class=""> htdocs/frontend/index.html
| 50 +--</div>
<div style="margin: 0px;" class=""> htdocs/frontend/javascripts/entities.js
| 131 ++++++--</div>
<div style="margin: 0px;" class=""> htdocs/frontend/javascripts/entity.js
| 207 +++++++++---</div>
<div style="margin: 0px;" class=""> htdocs/frontend/javascripts/flot/jquery.flot.axislabels.js
| 467 ++++++++++++++++++++++++++</div>
<div style="margin: 0px;" class=""> htdocs/frontend/javascripts/flot/jquery.flot.xgap.js
| 128 +++++++</div>
<div style="margin: 0px;" class=""> htdocs/frontend/javascripts/functions.js
| 84 +++--</div>
<div style="margin: 0px;" class=""> htdocs/frontend/javascripts/helper.js
| 18 +-</div>
<div style="margin: 0px;" class=""> htdocs/frontend/javascripts/init.js
| 47 ++-</div>
<div style="margin: 0px;" class=""> htdocs/frontend/javascripts/options.js
| 18 +-</div>
<div style="margin: 0px;" class=""> htdocs/frontend/javascripts/property.js
| 30 +-</div>
<div style="margin: 0px;" class=""> htdocs/frontend/javascripts/wui.js
| 112 ++++---</div>
<div style="margin: 0px;" class=""> htdocs/frontend/stylesheets/sprites.css
| 180 ++++++++++</div>
<div style="margin: 0px;" class=""> htdocs/frontend/stylesheets/style.css
| 54 +--</div>
<div style="margin: 0px;" class=""> lib/Volkszaehler/Controller/DataController.php
| 58 ++--</div>
<div style="margin: 0px;" class=""> lib/Volkszaehler/Controller/EntityController.php
| 55 +--</div>
<div style="margin: 0px;" class=""> lib/Volkszaehler/Definition/EntityDefinition.json
| 47 ++-</div>
<div style="margin: 0px;" class=""> lib/Volkszaehler/Definition/EntityDefinition.php
| 2 +-</div>
<div style="margin: 0px;" class=""> lib/Volkszaehler/Definition/PropertyDefinition.json
| 41 ++-</div>
<div style="margin: 0px;" class=""> lib/Volkszaehler/Interpreter/DataIterator.php
| 16 +-</div>
<div style="margin: 0px;" class=""> lib/Volkszaehler/Interpreter/Interpreter.php
| 15 +-</div>
<div style="margin: 0px;" class=""> lib/Volkszaehler/Interpreter/MeterInterpreter.php
| 16 +</div>
<div style="margin: 0px;" class=""> lib/Volkszaehler/Interpreter/SQL/MySQLOptimizer.php
| 98 +++++-</div>
<div style="margin: 0px;" class=""> lib/Volkszaehler/Interpreter/SQL/SQLOptimizer.php
| 2 +-</div>
<div style="margin: 0px;" class=""> lib/Volkszaehler/Interpreter/SensorInterpreter.php
| 31 +-</div>
<div style="margin: 0px;" class=""> lib/Volkszaehler/Model/Aggregate.php
| 2 +-</div>
<div style="margin: 0px;" class=""> lib/Volkszaehler/Model/Data.php
| 2 +-</div>
<div style="margin: 0px;" class=""> lib/Volkszaehler/Model/Entity.php
| 17 +-</div>
<div style="margin: 0px;" class=""> lib/Volkszaehler/Model/Property.php
| 2 +-</div>
<div style="margin: 0px;" class=""> lib/Volkszaehler/Util/Aggregation.php
| 48 ++-</div>
<div style="margin: 0px;" class=""> lib/Volkszaehler/Util/Console.php
| 127 -------</div>
<div style="margin: 0px;" class=""> lib/Volkszaehler/Util/ConsoleApplication.php
| 85 +++++</div>
<div style="margin: 0px;" class=""> lib/Volkszaehler/View/HTTP/Request.php
| 18 +-</div>
<div style="margin: 0px;" class=""> misc/tools/aggregate.php
| 164 ++++-----</div>
<div style="margin: 0px;" class=""> misc/tools/dbcopy.json
| 46 +++</div>
<div style="margin: 0px;" class=""> misc/tools/install.sh
| 135 ++++----</div>
<div style="margin: 0px;" class=""> misc/tools/model_helper.php
| 103 ++++++</div>
<div style="margin: 0px;" class=""> misc/tools/vzclient
| 17 +-</div>
<div style="margin: 0px;" class=""> misc/tools/vzmonitor
| 2 +-</div>
<div style="margin: 0px;" class=""> package.json
| 25 ++</div>
<div style="margin: 0px;" class=""> test/Tests/DataContext.php
| 8 +-</div>
<div style="margin: 0px;" class=""> test/Tests/DataCounterTest.php
| 1 +</div>
<div style="margin: 0px;" class=""> test/Tests/DataSensorTest.php
| 264 ++++++++++++++-</div>
<div style="margin: 0px;" class=""> test/Tests/Entity.php
| 118 +++++++</div>
<div style="margin: 0px;" class=""> test/Tests/SetupPerformanceData.php
| 5 +-</div>
<div style="margin: 0px;" class=""> test/phpunit.xml
| 6 +-</div>
<div style="margin: 0px;" class=""> 55 files changed, 2538
insertions(+), 1733 deletions(-)</div>
<div style="margin: 0px;" class=""> delete mode 100644
composer.lock</div>
<div style="margin: 0px;" class=""> create mode 100644
gulpfile.js</div>
<div style="margin: 0px;" class=""> create mode 100644
htdocs/frontend/images/blank.png</div>
<div style="margin: 0px;" class=""> create mode 100644
htdocs/frontend/images/json.png</div>
<div style="margin: 0px;" class=""> create mode 100644
htdocs/frontend/images/sprites.png</div>
<div style="margin: 0px;" class=""> create mode 100644
htdocs/frontend/images/types/pipe.png</div>
<div style="margin: 0px;" class=""> create mode 100644
htdocs/frontend/javascripts/flot/jquery.flot.axislabels.js</div>
<div style="margin: 0px;" class=""> create mode 100644
htdocs/frontend/javascripts/flot/jquery.flot.xgap.js</div>
<div style="margin: 0px;" class=""> create mode 100644
htdocs/frontend/stylesheets/sprites.css</div>
<div style="margin: 0px;" class=""> delete mode 100644
lib/Volkszaehler/Util/Console.php</div>
<div style="margin: 0px;" class=""> create mode 100644
lib/Volkszaehler/Util/ConsoleApplication.php</div>
<div style="margin: 0px;" class=""> create mode 100644
misc/tools/dbcopy.json</div>
<div style="margin: 0px;" class=""> create mode 100644
misc/tools/model_helper.php</div>
<div style="margin: 0px;" class=""> create mode 100644
package.json</div>
<div style="margin: 0px;" class=""> create mode 100644
test/Tests/Entity.php</div>
</div>
<div class=""><br class="">
</div>
<div class=""><br class="">
</div>
<div class="">dann habe ich neu gebotet und nun ist das
Verzeichnis </div>
<div class="">/var/www</div>
<div class=""><br class="">
</div>
<div class="">veeschwunden):</div>
<div class=""><br class="">
</div>
<div class="">Was ist nun schon wieder?</div>
<div class=""><br class="">
</div>
<div class="">Verzweifle noch an dem Update.</div>
<div class=""><br class="">
</div>
<div class=""><br class="">
</div>
<div class="">Gruß</div>
<div class=""><br class="">
</div>
<div class="">Daniel</div>
<div class=""><br class="">
</div>
<div class=""><br class="">
<div>
<blockquote type="cite" class="">
<div class="">Am 17.12.2014 um 22:55 schrieb Andreas Goetz
<<a moz-do-not-send="true"
href="mailto:cpuidle@gmail.com" class="">cpuidle@gmail.com</a>>:</div>
<br class="Apple-interchange-newline">
<div class=""><span style="font-family: Helvetica;
font-size: 12px; font-style: normal; font-variant:
normal; font-weight: normal; letter-spacing: normal;
line-height: normal; orphans: auto; text-align: start;
text-indent: 0px; text-transform: none; white-space:
normal; widows: auto; word-spacing: 0px;
-webkit-text-stroke-width: 0px; float: none; display:
inline !important;" class="">> sudo git checkout
composer.lock</span><br style="font-family: Helvetica;
font-size: 12px; font-style: normal; font-variant:
normal; font-weight: normal; letter-spacing: normal;
line-height: normal; orphans: auto; text-align: start;
text-indent: 0px; text-transform: none; white-space:
normal; widows: auto; word-spacing: 0px;
-webkit-text-stroke-width: 0px;" class="">
</div>
</blockquote>
</div>
<br class="">
</div>
</blockquote>
<br>
</body>
</html>